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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RepairStaffRoleCacheResultDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/15 5:49 下午
+ * @DESC
+ */
+@Data
+public class RepairStaffRoleCacheResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1220784037854283625L;
+
+    /**
+     * 角色key
+     */
+    private String roleKey;
+
+    /**
+     * 角色value
+     */
+    private String roleName;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 工作人员ID
+     */
+    private String staffId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@@ -199,7 +199,7 @@ public class StaffRoleController {
      */
     @PostMapping("repairstaffrolecache")
     public Result repairStaffRoleCache(){
-
+        staffRoleService.repairStaffRoleCache();
         return new Result();
     }
 

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

@@ -144,4 +144,12 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @date 2021/6/15 3:51 下午
      */
     List<RoleKeyValueResultDTO> getRolesByDB(@Param("userId")String userId);
+
+    /**
+     * @Description  查询所有用户角色
+     * @Param
+     * @author zxc
+     * @date 2021/6/15 5:54 下午
+     */
+    List<RepairStaffRoleCacheResultDTO> selectAllUserRoles();
 }

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

@@ -174,4 +174,12 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @date 2021/6/15 3:03 下午
      */
     CustomerAgencyUserRoleDTO getUserRoles(CustomerAgencyUserRoleFormDTO formDTO);
+
+    /**
+     * @Description  补全缓存 工作人员角色
+     * @Param
+     * @author zxc
+     * @date 2021/6/15 2:05 下午
+     */
+    void repairStaffRoleCache();
 }

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

@@ -236,4 +236,33 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         return null;
     }
 
+    /**
+     * @Description  补全缓存 工作人员角色
+     * @Param
+     * @author zxc
+     * @date 2021/6/15 2:05 下午
+     */
+    @Override
+    public void repairStaffRoleCache() {
+        // 查询所有工作人员的角色
+        List<RepairStaffRoleCacheResultDTO> allRoles = baseDao.selectAllUserRoles();
+        if (!CollectionUtils.isEmpty(allRoles)){
+            // 根据 userId分组【staffId】
+            Map<String, List<RepairStaffRoleCacheResultDTO>> groupByStaff = allRoles.stream().collect(Collectors.groupingBy(RepairStaffRoleCacheResultDTO::getStaffId));
+            groupByStaff.forEach((userId,list) -> {
+                CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO();
+                String customerId = list.get(NumConstant.ZERO).getCustomerId();
+                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);
+            });
+        }
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -220,4 +220,17 @@
         WHERE sr.DEL_FLAG = 0
           AND sr.STAFF_ID = #{userId}
     </select>
+
+    <!-- 查询所有用户角色 -->
+    <select id="selectAllUserRoles" resultType="com.epmet.dto.result.RepairStaffRoleCacheResultDTO">
+        SELECT
+            sr.ORG_ID,
+            sr.CUSTOMER_ID,
+            gsr.ROLE_KEY,
+            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
+        WHERE sr.DEL_FLAG = 0
+    </select>
 </mapper>