蓝图对接接口完善

epmet-auth/src/main/java/com/epmet/dto/form/ResiRegisterLantuFormDTO.java

@@ -18,9 +18,12 @@ public class ResiRegisterLantuFormDTO {
 
     private String nickName;
 
-    @NotBlank(message = "gridId不能为空")
+//    @NotBlank(message = "gridId不能为空")
     private String gridId;
 
+    @NotBlank(message = "areaCode不能为空")
+    private String areaCode;
+
     @NotBlank(message = "姓名不能为空")
     private String realName;
 

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -1156,7 +1156,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         lantuRegisterResiFormDTO.setNick(formDTO.getNickName());
         lantuRegisterResiFormDTO.setRealName(formDTO.getRealName());
         lantuRegisterResiFormDTO.setAvatarUrl(formDTO.getAvatarUrl());
-        lantuRegisterResiFormDTO.setGridId(formDTO.getGridId());
+
+        // 通过给的areaCode 去获取一下当前社区统建网格id
+        String gridId = govOrgOpenFeignClient.getGridIdByCommunityCode(formDTO.getAreaCode()).getData();
+
+
+        lantuRegisterResiFormDTO.setGridId(gridId);
 
 
         // 注册

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -785,4 +785,13 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/house/subuserhouselistRedis")
     Result subUserHouseListRedis();
 
+    /**
+     * @Description: 根据areaCode 查询网格id
+     * @param areaCode:
+     * @Return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author: lichao
+     * @Date: 2024/4/11 13:57
+     */
+    @PostMapping("/gov/org/agency/getGridIdByCommunityCode/{areaCode}")
+    Result<String> getGridIdByCommunityCode(@PathVariable(value = "areaCode")String areaCode);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -494,4 +494,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subUserHouseListRedis", "");
     }
 
+    @Override
+    public Result getGridIdByCommunityCode(String areaCode) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdByCommunityCode", areaCode);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -639,4 +639,19 @@ public class AgencyController {
         return new Result<List<AgencyResultDTO>>().ok(agencyService.getAllCommunity(customerId));
     }
 
+    /**
+     * @Description: 根据areaCode 查询网格id
+     * @param areaCode:
+     * @Return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author: lichao
+     * @Date: 2024/4/11 13:57
+     */
+    @PostMapping("getGridIdByCommunityCode/{areaCode}")
+    public Result<String> getGridIdByCommunityCode(@PathVariable(value = "areaCode") String areaCode) {
+        if (StringUtils.isBlank(areaCode)) {
+            return new Result<>();
+        }
+        return new Result<String>().ok(agencyService.getGridIdByCommunityCode(areaCode));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java

@@ -211,4 +211,6 @@ public interface AgencyService {
      * @return
      */
     List<AgencyResultDTO> getAllCommunity(String customerId);
+
+    String getGridIdByCommunityCode(String areaCode);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -1188,4 +1188,25 @@ public class AgencyServiceImpl implements AgencyService {
     public List<AgencyResultDTO> getAllCommunity(String customerId) {
         return customerAgencyDao.getAllCommunity(customerId);
     }
+
+    @Override
+    public String getGridIdByCommunityCode(String areaCode) {
+
+        LambdaQueryWrapper<CustomerAgencyEntity> agencyqw = new LambdaQueryWrapper<>();
+        agencyqw.eq(CustomerAgencyEntity::getAreaCode,areaCode).eq(CustomerAgencyEntity::getLevel,"community").orderByDesc(CustomerAgencyEntity::getCreatedTime).last("limit 1");
+        CustomerAgencyEntity community = customerAgencyDao.selectOne(agencyqw);
+        if (community == null){
+            String errorMsg = "当前areaCode查询社区失败："+areaCode;
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg);
+        }
+        LambdaQueryWrapper<CustomerGridEntity> gridqw = new LambdaQueryWrapper<>();
+        gridqw.eq(CustomerGridEntity::getPid,community.getId()).eq(CustomerGridEntity::getGridName,"统建网格").orderByDesc(CustomerGridEntity::getCreatedTime).last("limit 1");
+        CustomerGridEntity gridEntity = customerGridDao.selectOne(gridqw);
+        if (gridEntity == null){
+            String errorMsg = "当前areaCode查询到的社区没有统建网格："+areaCode;
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg);
+        }
+
+        return gridEntity.getId();
+    }
 }