Merge remote-tracking branch 'origin/dev_grid_patrol' into develop

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)
+    @NotBlank(message = "工作人员ID不能为空",groups = CustomerAgencyUserRoleForm.class)
-    private List<String> staffIds;
+    private String staffId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -594,5 +594,5 @@ public interface EpmetUserOpenFeignClient {
      * @date 2021/6/15 3:03 下午
      */
     @PostMapping("/epmetuser/staffrole/getroles")
-    Result<List<CustomerAgencyUserRoleDTO>> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO);
+    Result<CustomerAgencyUserRoleDTO> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -405,8 +405,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<CustomerAgencyUserRoleDTO>> getRoles(CustomerAgencyUserRoleFormDTO formDTO) {
+    public Result<CustomerAgencyUserRoleDTO> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRoles", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoles", formDTO);
     }
 
 }

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<List<CustomerAgencyUserRoleDTO>> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){
+    public Result<CustomerAgencyUserRoleDTO> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, CustomerAgencyUserRoleFormDTO.CustomerAgencyUserRoleForm.class);
-        return new Result<List<CustomerAgencyUserRoleDTO>>().ok(staffRoleService.getRoles(formDTO));
+        return new Result<CustomerAgencyUserRoleDTO>().ok(staffRoleService.getUserRoles(formDTO));
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -143,5 +143,5 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @author zxc
      * @date 2021/6/15 3:51 下午
      */
-    List<RoleKeyValueResultDTO> getRolesByDB(@Param("userIds")List<String> userIds);
+    List<RoleKeyValueResultDTO> getRolesByDB(@Param("userId")String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java

@@ -173,5 +173,5 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @author zxc
      * @date 2021/6/15 3:03 下午
      */
-    List<CustomerAgencyUserRoleDTO> getRoles(CustomerAgencyUserRoleFormDTO formDTO);
+    CustomerAgencyUserRoleDTO getUserRoles(CustomerAgencyUserRoleFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -211,41 +211,29 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
      * @date 2021/6/15 3:03 下午
      */
     @Override
-    public List<CustomerAgencyUserRoleDTO> getRoles(CustomerAgencyUserRoleFormDTO formDTO) {
+    public CustomerAgencyUserRoleDTO getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) {
-        List<CustomerAgencyUserRoleDTO> result = new ArrayList<>();
+        String staffId = formDTO.getStaffId();
-        List<String> disUserIds = new ArrayList<>();
+        String customerId = formDTO.getCustomerId();
-        if (!CollectionUtils.isEmpty(formDTO.getStaffIds())){
+        CustomerAgencyUserRoleDTO role = staffRoleRedis.getRole(customerId, staffId);
-            List<String> staffIds = formDTO.getStaffIds();
+        if (null != role){
-            String customerId = formDTO.getCustomerId();
+            return role;
-            staffIds.forEach(userId -> {
+        }else {
-                CustomerAgencyUserRoleDTO role = staffRoleRedis.getRole(customerId, userId);
+            List<RoleKeyValueResultDTO> rolesByDB = baseDao.getRolesByDB(staffId);
-                if (null != role){
+            if (!CollectionUtils.isEmpty(rolesByDB)) {
-                    result.add(role);
+                CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO();
-                }else {
+                dto.setStaffId(rolesByDB.get(NumConstant.ZERO).getStaffId());
-                    disUserIds.add(userId);
+                dto.setCustomerId(customerId);
-                }
+                dto.setAgencyId(rolesByDB.get(NumConstant.ZERO).getOrgId());
-            });
+                Map map = new HashMap(16);
-            if (!CollectionUtils.isEmpty(disUserIds)){
+                rolesByDB.forEach(l -> {
-                List<RoleKeyValueResultDTO> rolesByDB = baseDao.getRolesByDB(disUserIds);
+                    map.put(l.getRoleKey(), l.getRoleName());
-                if (!CollectionUtils.isEmpty(rolesByDB)){
+                });
-                    Map<String, List<RoleKeyValueResultDTO>> groupByUserId = rolesByDB.stream().collect(Collectors.groupingBy(RoleKeyValueResultDTO::getStaffId));
+                dto.setRoles(map.toString());
-                    groupByUserId.forEach((userId,list) -> {
+                staffRoleRedis.setRole(customerId, staffId, dto);
-                        CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO();
+                return dto;
-                        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);
-                    });
-                }
             }
         }
-        return result;
+        return null;
     }
 
 }

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 (
+          AND sr.STAFF_ID = #{userId}
-              <foreach collection="userIds" item="userId" separator=" OR ">
-                  sr.STAFF_ID = #{userId}
-              </foreach>
-            )
     </select>
 </mapper>