Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/RoleUsersResultDTO.java

@@ -20,6 +20,6 @@ public class RoleUsersResultDTO implements Serializable {
     private String name;
     private String headPhoto;
     private String orgName;
-    private String gender;
+    private Integer gender;
     private List<String> roles;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/ReceiverDTO.java

@@ -35,5 +35,5 @@ public class ReceiverDTO implements Serializable {
     /**
      * 1男2女0未知
      */
-    private String gender;
+    private Integer gender;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -75,7 +75,11 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
             ReceiverDTO dto = new ReceiverDTO();
             dto.setStaffId(item.getStaffId());
             dto.setReadFlag(item.getReadFlag());
-            //TODO redis获取用户信息
+            CustomerStaffInfoCacheResult staffInfoCache = customerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId());
+            dto.setStaffName(staffInfoCache.getRealName());
+            dto.setGender(staffInfoCache.getGender());
+            dto.setHeadPhoto(staffInfoCache.getHeadPhoto());
+            dto.setOrgName(staffInfoCache.getTwoOrgName());
             return dto;
         }).collect(Collectors.toList());
         result.setDataList(dataList);
@@ -139,8 +143,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
                     staffInfo.setStaffName(staffInfoCache.getRealName());
                     staffInfo.setGender(staffInfoCache.getGender().toString());
                     staffInfo.setHeadPhoto(StringUtils.isNotBlank(staffInfoCache.getHeadPhoto()) ? staffInfoCache.getHeadPhoto() : StrConstant.EPMETY_STR);
-                    //todo
-                    staffInfo.setOrgName("todo get");
+                    staffInfo.setOrgName(staffInfoCache.getTwoOrgName());
                     resDTO.getStaffList().add(staffInfo);
                 }
             }
@@ -168,8 +171,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
             detail.setStaffName(staffInfoCache.getRealName());
             detail.setGender(staffInfoCache.getGender().toString());
             detail.setHeadPhoto(StringUtils.isNotBlank(staffInfoCache.getHeadPhoto()) ? staffInfoCache.getHeadPhoto() : StrConstant.EPMETY_STR);
-            //todo
-            detail.setOrgName("todo get");
+            detail.setOrgName(staffInfoCache.getTwoOrgName());
         }
         result.setDataList(data.getList());
         return result;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -5,7 +5,9 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IdAndNameDTO;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.BadgeConstant;
@@ -73,6 +75,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private GovProjectService govProjectService;
     @Resource
     private GovStaffRoleDao govStaffRoleDao;
+    @Resource
+    private CustomerStaffRedis customerStaffRedis;
 
     /**
      * @Description  根据UserIds查询
@@ -481,7 +485,13 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return staffRoleList.stream().map(item -> {
             RoleUsersResultDTO dto = new RoleUsersResultDTO();
             dto.setStaffId(item.getStaffId());
-            //TODO 从redis获取用户信息
+            //从redis获取用户信息
+            CustomerStaffInfoCacheResult staffInfoCache = customerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId());
+            dto.setGender(staffInfoCache.getGender());
+            dto.setHeadPhoto(staffInfoCache.getHeadPhoto());
+            dto.setName(staffInfoCache.getRealName());
+            dto.setOrgName(staffInfoCache.getTwoOrgName());
+            dto.setRoles(new ArrayList<>(staffInfoCache.getRoleMap().values()));
             return dto;
         }).collect(Collectors.toList());
     }