From e742dd813ca48cbca806130f8419150441113e3d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 10:27:31 +0800
Subject: [PATCH] 获取用户角色修改
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 14 +++++++-------
screen-api/src/main/resources/mapper/GroupMapper.xml | 8 ++++----
screen-api/src/main/resources/mapper/UserMapper.xml | 4 ++--
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 6 ++----
screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java | 2 +-
screen-api/src/main/java/com/moral/api/service/GroupService.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 15 +++++++--------
screen-api/src/main/java/com/moral/api/controller/UserController.java | 1 -
screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java | 2 +-
9 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index 302b910..eb3efcc 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -102,20 +103,19 @@
return ResultMessage.ok(pageResult);
}
- @ApiOperation(value = "���������������������ids", notes = "���������������������ids")
+ @ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "getGroupIds", method = RequestMethod.GET)
- public ResultMessage getGroupIds(Integer userId) {
- System.out.println(userId);
- if (userId == null) {
+ @RequestMapping(value = "getGroup", method = RequestMethod.GET)
+ public ResultMessage getGroup(Integer userId) {
+ if (ObjectUtils.isEmpty(userId)) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> groups = groupService.getGroupIds(userId);
- return ResultMessage.ok(groups);
+ Map<String, Object> group = groupService.getGroup(userId);
+ return ResultMessage.ok(group);
}
@ApiOperation(value = "���������������", notes = "���������������")
diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index 39b7c5a..1d1560a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -41,7 +41,6 @@
})
@RequestMapping(value = "insert", method = RequestMethod.POST)
public ResultMessage insert(@RequestBody User user) {
- System.out.println(user);
if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
diff --git a/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java b/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
index f5c628d..21a0857 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java
@@ -16,6 +16,6 @@
*/
public interface GroupMapper extends BaseMapper<Group> {
- List<Map<String, Object>> selectUserGroup(Map<String, Object> parameters);
+ Map<String, Object> selectUserGroup(Integer userId);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
index e78948a..56a9557 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/bo/UserBO.java
@@ -20,6 +20,6 @@
private Organization organization;
- private List<Group> groups;
+ private Group group;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/GroupService.java b/screen-api/src/main/java/com/moral/api/service/GroupService.java
index cde76b5..627fa61 100644
--- a/screen-api/src/main/java/com/moral/api/service/GroupService.java
+++ b/screen-api/src/main/java/com/moral/api/service/GroupService.java
@@ -31,6 +31,6 @@
Page<Group> selectGroups(Map<String, Object> parameters);
//���������������������������
- List<Map<String, Object>> getGroupIds(Integer userId);
+ Map<String, Object> getGroup(Integer userId);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index 166a709..254c76f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -166,9 +166,7 @@
}
@Override
- public List<Map<String, Object>> getGroupIds(Integer userId) {
- Map<String, Object> params = new HashMap<>();
- params.put("userId", userId);
- return groupMapper.selectUserGroup(params);
+ public Map<String, Object> getGroup(Integer userId) {
+ return groupMapper.selectUserGroup(userId);
}
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 457d335..b3a584b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -139,14 +139,13 @@
userInfo.put("organization", orgInfo);
//���������������
- List<Map<String, Object>> groups = new ArrayList<>();
- for (Group group : userBo.getGroups()) {
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
- groupMap.put("id", group.getId());
- groupMap.put("groupName", group.getGroupName());
- groups.add(groupMap);
- }
- userInfo.put("groups", groups);
+ Group group = userBo.getGroup();
+
+ HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+
+ userInfo.put("group", groupMap);
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index e54c082..b24ccb4 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -12,13 +12,13 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <select id="selectUserGroup" resultMap="BaseResultMap">
- SELECT g.id,g.group_name
+ <select id="selectUserGroup" resultType="java.util.Map">
+ SELECT g.id,g.group_name groupName
FROM `group` g,`user_group` ug
WHERE ug.user_id = #{userId}
AND ug.group_id = g.id
- AND g.is_delete = 0
- AND ug.is_delete = 0
+ AND g.is_delete = '0'
+ AND ug.is_delete = '0'
ORDER BY g.id
</select>
</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index cc4fe83..fa2b662 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -28,10 +28,10 @@
<result column="org_expire_time" property="expireTime"/>
</association>
<!--���������-->
- <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
+ <association property="group" javaType="com.moral.api.entity.Group">
<id column="group_id" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
- </collection>
+ </association>
</resultMap>
<!--������������������������������������������-->
--
Gitblit v1.8.0