完善信息 居住网格 处理机制

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -72,4 +72,9 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
      * 加密算法的初始向量
      */
     private String iv;
+
+    /**
+     * 居住网格id
+     */
+    private Long gridId;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java

@@ -34,10 +34,6 @@ public class EpdcCompleteUserInfoDTO implements Serializable {
      */
     private String realName;
 
-    /**
-     * 网格Id
-     */
-    private Long gridId;
     /**
      * 所在道路
      */
@@ -66,4 +62,14 @@ public class EpdcCompleteUserInfoDTO implements Serializable {
      * 性别
      */
     private String sex;
+
+    /**
+     * 居住网格id
+     */
+    private Long gridId;
+
+    /**
+     * 居住网格名称
+     */
+    private String gridName;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -766,6 +766,7 @@ public class AppUserServiceImpl implements AppUserService {
     public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
 
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
+        userDto.setDeptId(Long.valueOf(infoDto.getGridId()));
         userDto.setId(tokenDto.getUserId());
 
         if (StringUtils.isNotBlank(infoDto.getWxCode())) {
@@ -798,7 +799,7 @@ public class AppUserServiceImpl implements AppUserService {
         }
         String userState = verifyResult.getData();
 
-        UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId());
+        UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(infoDto.getGridId());
         EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
         completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState);
         // 组装对象，准备保存用户信息
@@ -839,6 +840,24 @@ public class AppUserServiceImpl implements AppUserService {
 
         Result<UserDTO> result = userFeignClient.getUserInfoById(tokenDto.getUserId());
         if (result.success() && null != result.getData()) {
+            if (("0").equals(result.getData().getState())) {
+                //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端
+                Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());
+                if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) {
+                    String allDeptNames = resultParentAndAllDeptDTO.getData().getAllDeptNames();
+                    if (StringUtils.isNotBlank(allDeptNames)) {
+                        String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
+                        result.getData().setGrid(gridName);
+                    }
+                }
+            } else {
+                //用户已完善信息：获取用户alldeptnames 的后两级机构（社区-网格）
+                String allDeptNames = result.getData().getAllDeptNames();
+                if (StringUtils.isNotBlank(allDeptNames)) {
+                    String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
+                    result.getData().setGrid(gridName);
+                }
+            }
             EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class);
             dto.setGridId(tokenDto.getGridId());
             return new Result<EpdcCompleteUserInfoDTO>().ok(dto);

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -328,5 +328,28 @@ public class UserDTO implements Serializable {
      * 认证历史-不通过次数
      */
     private Integer totalFailNum;
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
 
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java

@@ -99,4 +99,8 @@ public class EpdcCompleteAppUserDTO implements Serializable {
      */
     private String wxUnionId;
 
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -229,4 +229,28 @@ public class UserEntity extends BaseEpdcEntity {
      */
     private String remark;
 
+    /**
+     * 居住网格id
+     */
+    private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java

@@ -136,8 +136,15 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
     public Result<List<EpdcUserGridResultDTO>> listUserGridForApi(String userId) {
         QueryWrapper<UserGridRelationEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(UserFieldConsant.USER_ID, userId)
-                .orderByDesc(UserFieldConsant.SWITCHED_TIME);
+            .orderByDesc(UserFieldConsant.SWITCHED_TIME);
         List<UserGridRelationEntity> entityList = this.baseDao.selectList(queryWrapper);
+        for (UserGridRelationEntity userGridRelationEntity : entityList) {
+            String allDeptNames = userGridRelationEntity.getAllDeptNames();
+            if (StringUtils.isNotBlank(allDeptNames)) {
+                String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
+                userGridRelationEntity.setGrid(gridName);
+            }
+        }
         List<EpdcUserGridResultDTO> dtoList = ConvertUtils.sourceToTarget(entityList, EpdcUserGridResultDTO.class);
         return new Result<List<EpdcUserGridResultDTO>>().ok(dtoList);
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -505,24 +505,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         // 身份证号
         String identityNo = userDto.getIdentityNo();
+
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(userGridRelation.getGridId()));
+        if (!parentAndAllDeptDTOResult.success()) {
+            return new Result<UserDTO>().error(parentAndAllDeptDTOResult.getMsg());
+        }
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
-
-            Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(userGridRelation.getGridId()));
-            if (!parentAndAllDeptDTOResult.success()) {
-                return new Result<UserDTO>().error(parentAndAllDeptDTOResult.getMsg());
-            }
             partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
             partyMembersEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
             partyMembersEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
             partyMembersEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
-
-//            //修改数据库结构
-//            partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid());
-//            partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId());
-//            partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity());
-//            partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId());
-
             partyMembersEntity.setGridId(userGridRelation.getGridId());
             partyMembersEntity.setGridName(userGridRelation.getGrid());
             partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value());
@@ -579,6 +572,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         userDto.setLastName(lastName);
         userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
 
+        //保存用户居住地所在网格，及其他冗余字段。
+        userDto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        userDto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+        userDto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+        userDto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+
         UserEntity userEntity = ConvertUtils.sourceToTarget(userDto, UserEntity.class);
         boolean updateUser = this.updateById(userEntity);
         if (!updateUser) {