From 4c958a910b01d225eb31ea3d9b8100f0139c32b8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Jun 2021 16:31:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 4 ++-- .../main/java/com/epmet/controller/StaffRoleController.java | 4 ++-- .../src/main/java/com/epmet/service/StaffRoleService.java | 2 +- .../java/com/epmet/service/impl/StaffRoleServiceImpl.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 2b653dc220..9686f28e58 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -574,5 +574,5 @@ public interface EpmetUserOpenFeignClient { * @date 2021/6/15 3:03 下午 */ @PostMapping("/epmetuser/staffrole/getroles") - Result> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO); + Result> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 26f53bfea3..a10545a10d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -395,8 +395,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result> getRoles(CustomerAgencyUserRoleFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRoles", formDTO); + public Result> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoles", formDTO); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 14ec76b364..08a5041dc5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -210,8 +210,8 @@ public class StaffRoleController { * @date 2021/6/15 3:03 下午 */ @PostMapping("getroles") - public Result> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){ + public Result> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, CustomerAgencyUserRoleFormDTO.CustomerAgencyUserRoleForm.class); - return new Result>().ok(staffRoleService.getRoles(formDTO)); + return new Result>().ok(staffRoleService.getUserRoles(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java index 283358cbaa..ceb070f3ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java @@ -173,5 +173,5 @@ public interface StaffRoleService extends BaseService { * @author zxc * @date 2021/6/15 3:03 下午 */ - List getRoles(CustomerAgencyUserRoleFormDTO formDTO); + List getUserRoles(CustomerAgencyUserRoleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index e268a87364..3ee5e72bb3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -211,7 +211,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl getRoles(CustomerAgencyUserRoleFormDTO formDTO) { + public List getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { List result = new ArrayList<>(); List disUserIds = new ArrayList<>(); if (!CollectionUtils.isEmpty(formDTO.getStaffIds())){ From 978dd5fb32e79d4fc6e93a88998a0563d7019799 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Jun 2021 16:50:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=94=B9=E5=8D=95=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CustomerAgencyUserRoleFormDTO.java | 4 +- .../epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../EpmetUserOpenFeignClientFallback.java | 2 +- .../epmet/controller/StaffRoleController.java | 4 +- .../main/java/com/epmet/dao/StaffRoleDao.java | 2 +- .../com/epmet/service/StaffRoleService.java | 2 +- .../service/impl/StaffRoleServiceImpl.java | 54 ++++++++----------- .../main/resources/mapper/StaffRoleDao.xml | 8 +-- 8 files changed, 31 insertions(+), 47 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java index 8d1bd02d21..392e995b86 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerAgencyUserRoleFormDTO.java @@ -25,6 +25,6 @@ public class CustomerAgencyUserRoleFormDTO implements Serializable { /** * 工作人员IDs */ - @NotNull(message = "工作人员IDS不能为空",groups = CustomerAgencyUserRoleForm.class) - private List staffIds; + @NotBlank(message = "工作人员ID不能为空",groups = CustomerAgencyUserRoleForm.class) + private String staffId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 9686f28e58..1f619168ae 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -574,5 +574,5 @@ public interface EpmetUserOpenFeignClient { * @date 2021/6/15 3:03 下午 */ @PostMapping("/epmetuser/staffrole/getroles") - Result> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO); + Result getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index a10545a10d..c4cb042786 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -395,7 +395,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { + public Result getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoles", formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 08a5041dc5..411b6fee69 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -210,8 +210,8 @@ public class StaffRoleController { * @date 2021/6/15 3:03 下午 */ @PostMapping("getroles") - public Result> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){ + public Result getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, CustomerAgencyUserRoleFormDTO.CustomerAgencyUserRoleForm.class); - return new Result>().ok(staffRoleService.getUserRoles(formDTO)); + return new Result().ok(staffRoleService.getUserRoles(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java index 6436ef8ff6..25c8c2687f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java @@ -143,5 +143,5 @@ public interface StaffRoleDao extends BaseDao { * @author zxc * @date 2021/6/15 3:51 下午 */ - List getRolesByDB(@Param("userIds")List userIds); + List getRolesByDB(@Param("userId")String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java index ceb070f3ad..0fd2fcb101 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java @@ -173,5 +173,5 @@ public interface StaffRoleService extends BaseService { * @author zxc * @date 2021/6/15 3:03 下午 */ - List getUserRoles(CustomerAgencyUserRoleFormDTO formDTO); + CustomerAgencyUserRoleDTO getUserRoles(CustomerAgencyUserRoleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index 3ee5e72bb3..578c577f17 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -211,41 +211,29 @@ public class StaffRoleServiceImpl extends BaseServiceImpl getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { - List result = new ArrayList<>(); - List disUserIds = new ArrayList<>(); - if (!CollectionUtils.isEmpty(formDTO.getStaffIds())){ - List staffIds = formDTO.getStaffIds(); - String customerId = formDTO.getCustomerId(); - staffIds.forEach(userId -> { - CustomerAgencyUserRoleDTO role = staffRoleRedis.getRole(customerId, userId); - if (null != role){ - result.add(role); - }else { - disUserIds.add(userId); - } - }); - if (!CollectionUtils.isEmpty(disUserIds)){ - List rolesByDB = baseDao.getRolesByDB(disUserIds); - if (!CollectionUtils.isEmpty(rolesByDB)){ - Map> groupByUserId = rolesByDB.stream().collect(Collectors.groupingBy(RoleKeyValueResultDTO::getStaffId)); - groupByUserId.forEach((userId,list) -> { - CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO(); - dto.setStaffId(list.get(NumConstant.ZERO).getStaffId()); - dto.setCustomerId(customerId); - dto.setAgencyId(list.get(NumConstant.ZERO).getOrgId()); - Map map = new HashMap(16); - list.forEach(l -> { - map.put(l.getRoleKey(),l.getRoleName()); - }); - dto.setRoles(map.toString()); - staffRoleRedis.setRole(customerId,userId,dto); - result.add(dto); - }); - } + public CustomerAgencyUserRoleDTO getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) { + String staffId = formDTO.getStaffId(); + String customerId = formDTO.getCustomerId(); + CustomerAgencyUserRoleDTO role = staffRoleRedis.getRole(customerId, staffId); + if (null != role){ + return role; + }else { + List rolesByDB = baseDao.getRolesByDB(staffId); + if (!CollectionUtils.isEmpty(rolesByDB)) { + CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO(); + dto.setStaffId(rolesByDB.get(NumConstant.ZERO).getStaffId()); + dto.setCustomerId(customerId); + dto.setAgencyId(rolesByDB.get(NumConstant.ZERO).getOrgId()); + Map map = new HashMap(16); + rolesByDB.forEach(l -> { + map.put(l.getRoleKey(), l.getRoleName()); + }); + dto.setRoles(map.toString()); + staffRoleRedis.setRole(customerId, staffId, dto); + return dto; } } - return result; + return null; } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml index 8be9018471..437abfa4e3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml @@ -216,12 +216,8 @@ gsr.ROLE_NAME, sr.STAFF_ID FROM staff_role sr - LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0 + LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0 WHERE sr.DEL_FLAG = 0 - AND ( - - sr.STAFF_ID = #{userId} - - ) + AND sr.STAFF_ID = #{userId}