需求表存储需求人的房屋地址

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -164,12 +164,14 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if(!demandUserRes.success()||null==demandUserRes.getData()){
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人信息异常");
         }
-        updateEntity.setDemandUserHouseId(demandUserRes.getData().getVillageId());
+        updateEntity.setDemandUserHouseId(demandUserRes.getData().getHomeId());
         // 查询需求人的居住地址
         Set<String> houseIds=new HashSet<>();
         houseIds.add(updateEntity.getDemandUserHouseId());
         Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds);
-        if(houseInfoRes.success()&&CollectionUtils.isNotEmpty(houseInfoRes.getData())){
+        if(!houseInfoRes.success()||CollectionUtils.isEmpty(houseInfoRes.getData())){
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人房屋地址信息异常"+JSON.toJSONString(houseInfoRes));
+        }
             HouseInfoDTO houseInfoDTO=houseInfoRes.getData().get(NumConstant.ZERO);
             updateEntity.setServiceLocation(houseInfoDTO.getNeighborAddress().
                     concat(houseInfoDTO.getNeighborHoodName())
@@ -178,7 +180,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                     .concat(houseInfoDTO.getDoorName()));
             updateEntity.setLongitude(houseInfoDTO.getBuildingLongitude());
             updateEntity.setLatitude(houseInfoDTO.getBuildingLatitude());
-        }
         baseDao.updateById(updateEntity);
 
         IcUserDemandOperateLogEntity logEntity=new IcUserDemandOperateLogEntity();
@@ -230,14 +231,16 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         //查找需求人居住的房子
         Result<IcResiUserDTO> demandUserRes=epmetUserOpenFeignClient.getIcResiUserDTO(fromDTO.getDemandUserId());
         if(!demandUserRes.success()||null==demandUserRes.getData()){
-            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人信息异常");
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人信息异常"+ JSON.toJSONString(demandUserRes));
         }
-        insertEntity.setDemandUserHouseId(demandUserRes.getData().getVillageId());
+        insertEntity.setDemandUserHouseId(demandUserRes.getData().getHomeId());
         // 查询需求人的居住地址
         Set<String> houseIds=new HashSet<>();
         houseIds.add(insertEntity.getDemandUserHouseId());
         Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds);
-        if(houseInfoRes.success()&&CollectionUtils.isNotEmpty(houseInfoRes.getData())){
+        if(!houseInfoRes.success()||CollectionUtils.isEmpty(houseInfoRes.getData())){
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人房屋地址信息异常"+JSON.toJSONString(houseInfoRes));
+        }
         HouseInfoDTO houseInfoDTO=houseInfoRes.getData().get(NumConstant.ZERO);
         insertEntity.setServiceLocation(houseInfoDTO.getNeighborAddress().
                 concat(houseInfoDTO.getNeighborHoodName())
@@ -246,7 +249,6 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 .concat(houseInfoDTO.getDoorName()));
         insertEntity.setLongitude(houseInfoDTO.getBuildingLongitude());
         insertEntity.setLatitude(houseInfoDTO.getBuildingLatitude());
-        }
         baseDao.insert(insertEntity);
         IcUserDemandOperateLogEntity logEntity=new IcUserDemandOperateLogEntity();
         logEntity.setCustomerId(fromDTO.getCustomerId());

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -687,6 +687,6 @@ public interface EpmetUserOpenFeignClient {
      * @param icResiUserId
      * @return
      */
-    @GetMapping("/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
+    @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
     Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId);
 }

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

@@ -633,7 +633,7 @@ public class IcResiUserController {
      * @param icResiUserId
      * @return
      */
-    @GetMapping("geticresiuser/{icResiUserId}")
+    @PostMapping("geticresiuser/{icResiUserId}")
     public Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId){
         if(StringUtils.isNotBlank(icResiUserId)){
             return new Result<IcResiUserDTO>().ok(icResiUserService.get(icResiUserId));