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

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java

@@ -9,5 +9,5 @@ import lombok.Data;
 */
 @Data
 public class ResiEventNpcListFormDTO {
-    private String gridId;
+    private String customerId;
 }

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java

@@ -20,8 +20,16 @@ public class ResiEventNpcResultDTO {
 
     private String gridId;
 
+    /**
+     * 展示名
+     */
     private String displayName;
 
+    /**
+     * 真实姓名
+     */
+    private String userShowName;
+
     private String headImgUrl;
 
     private String agencyId;

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -32,15 +32,15 @@ public class ResiEventController {
 
     /**
      * @return
-     * @Description 查询人大代表列表
+     * @Description 查询人大代表列表(客户下的)
      * @author wxz
      * @date 2021.08.03 09:17
      */
-    @PostMapping("/npc-list-ingrid")
+    @PostMapping("/npc-list")
     public Result<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
-        String gridId = input.getGridId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(gridId);
+        String customerId = input.getCustomerId();
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java

@@ -18,7 +18,7 @@ public interface ResiEventService {
      * @author wxz
      * @date 2021.08.03 09:29
     */
-    List<ResiEventNpcResultDTO> listNpcByGrid(String gridId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
 
     /**
      * @Description 查询上报目标列表

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -36,29 +36,62 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public List<ResiEventNpcResultDTO> listNpcByGrid(String gridId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
 
         // 查询网格所属的组织信息
-        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId);
-        GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
-        String parentAgencyId = gridInfoData.getParentAgencyId();
-        String pids = gridInfoData.getPids();
+        //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
+        //GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+        //String parentAgencyId = gridInfoData.getParentAgencyId();
+        //String pids = gridInfoData.getPids();
 
         //查询人大代表列表
-        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC);
+        ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, BadgeConstant.BADGE_KEY_NPC);
         Result<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm);
         List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null);
 
-        List<ResiEventNpcResultDTO> npcResultList = npcData.stream()
-                .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId, pids))
-                .collect(Collectors.toList());
+        //批量查询人大代表所在的网格信息
+        List<String> npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList());
+        OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds);
+        Result<List<OrgInfoResultDTO>> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        List<OrgInfoResultDTO> npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null);
+
+        Map<String, OrgInfoResultDTO> npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos);
+
+        List<ResiEventNpcResultDTO> npcResultList = new ArrayList<>();
+        npcData.stream().forEach(npc -> {
+                    OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId());
+                    ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO(
+                            npc.getUserId(),
+                            npc.getGridId(),
+                            "人大代表-".concat(npc.getRealName()),
+                            npc.getRealName(),
+                            npc.getHeadImgUrl(),
+                            gridInfo != null ? gridInfo.getAgencyId() : null,
+                            gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null);
+                    npcResultList.add(resiEventNpcInfo);
+                }
+        );
 
         return npcResultList;
     }
 
     /**
-     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @return
+     * @Description 将网格信息转化为map
+     * @author wxz
+     * @date 2021.08.04 14:25
+     */
+    private Map<String, OrgInfoResultDTO> convertNpcGridInfos2Map(List<OrgInfoResultDTO> npcGridInfos) {
+        HashMap<String, OrgInfoResultDTO> result = new HashMap<>();
+        npcGridInfos.stream().forEach(i -> {
+            result.put(i.getOrgId(), i);
+        });
+        return result;
+    }
+
+    /**
+     * @return
+     * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序
      * @author wxz
      * @date 2021.08.03 15:51
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java

@@ -11,10 +11,9 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class ListUserByBadgeFormDTO {
 
-    @NotBlank(message = "网格ID不能为空")
-    private String gridId;
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
 
     @NotBlank(message = "徽章key不能为空")
     private String badgeKey;
-
 }

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

@@ -199,10 +199,10 @@ public class BadgeController {
 	public Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) {
 		ValidatorUtils.validateEntity(input);
 
-		String gridId = input.getGridId();
+		String customerId = input.getCustomerId();
 		String badgeKey = input.getBadgeKey();
 
-		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(gridId, badgeKey);
+		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(customerId, badgeKey);
 		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
 	}
 }

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

@@ -203,5 +203,5 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @author wxz
 	 * @date 2021.08.02 10:40
 	*/
-    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey);
 }

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

@@ -199,5 +199,5 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @author wxz
      * @date 2021.08.02 10:39
     */
-    List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey);
+    List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey);
 }

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

@@ -481,7 +481,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     }
 
     @Override
-    public List<ListUserByBadgeResultDTO> listUsersByBadge(String gridId, String badgeKey) {
-        return baseDao.listUsersByBadge(gridId, badgeKey);
+    public List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey) {
+        return baseDao.listUsersByBadge(customerId, badgeKey);
     }
 }

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

@@ -320,7 +320,7 @@
             user_base_info.HEAD_IMG_URL
         from resi_user_badge
                  inner join badge on (badge.BADGE_KEY = #{badgeKey}
-                                    and resi_user_badge.GRID_ID = #{gridId}
+                                    and resi_user_badge.CUSTOMER_ID=#{customerId}
                                     and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved'
                                     and resi_user_badge.DEL_FLAG = 0
                                     and resi_user_badge.BADGE_ID = badge.ID