房屋缓存

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -637,7 +637,7 @@ public class RedisKeys {
 		return rootPrefix.concat("org:temp:orgtree").concat(agencyId);
 	}
 
-	public static String getHouseInfoCacheKey(String houseId){
+	public static String getHouseInfoCacheKey(String houseId,String customerId){
-		return rootPrefix.concat("house:").concat(houseId);
+		return rootPrefix.concat("house:").concat(customerId).concat(":").concat(houseId);
 	}
 }

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

@@ -154,7 +154,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         // 查询需求人的居住地址
         Set<String> houseIds=new HashSet<>();
         houseIds.add(updateEntity.getDemandUserHouseId());
-        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds);
+        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds,dto.getCustomerId());
         if(!houseInfoRes.success()||CollectionUtils.isEmpty(houseInfoRes.getData())){
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人房屋地址信息异常"+JSON.toJSONString(houseInfoRes));
         }
@@ -223,7 +223,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         // 查询需求人的居住地址
         Set<String> houseIds=new HashSet<>();
         houseIds.add(insertEntity.getDemandUserHouseId());
-        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds);
+        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds, fromDTO.getCustomerId());
         if(!houseInfoRes.success()||CollectionUtils.isEmpty(houseInfoRes.getData())){
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询需求人房屋地址信息异常"+JSON.toJSONString(houseInfoRes));
         }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java

@@ -76,4 +76,6 @@ public class HouseInfoDTO implements Serializable {
      * 小区名+楼栋名+单元名+房屋名
      */
     private String allName;
+
+    private String customerId;
 }

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

@@ -460,7 +460,7 @@ public interface GovOrgOpenFeignClient {
     Result<CustomerGridDTO> getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO);
 
     @PostMapping(value = "/gov/org/house/queryListHouseInfo",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody  Set<String> houseIds);
+    Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody  Set<String> houseIds, @RequestParam("customerId") String customerId);
 
     
     

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

@@ -276,8 +276,8 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result<List<HouseInfoDTO>> queryListHouseInfo(Set<String> houseIds) {
+    public Result<List<HouseInfoDTO>> queryListHouseInfo(Set<String> houseIds ,String customerId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListHouseInfo", houseIds);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListHouseInfo", houseIds, customerId);
     }
 
     @Override

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

@@ -229,7 +229,7 @@ public class HouseController implements ResultDataResolver {
     }
 
     @PostMapping( "queryListHouseInfo")
-    Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds){
+    Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds, @RequestParam("customerId") String customerId){
-        return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds));
+        return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds,customerId));
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcHouseRedis.java

@@ -62,20 +62,20 @@ public class IcHouseRedis {
      * @author zxc
      * @date 2022/1/18 3:55 下午
      */
-    public void setHouseInfo(String houseId, Map<String, Object> map){
+    public void setHouseInfo(String houseId, Map<String, Object> map,String customerId){
-        String key = RedisKeys.getHouseInfoCacheKey(houseId);
+        String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId);
         redisUtils.hMSet(key, map);
     }
 
-    public HouseInfoDTO getHouseInfo(String houseId){
+    public HouseInfoDTO getHouseInfo(String houseId,String customerId){
-        String key = RedisKeys.getHouseInfoCacheKey(houseId);
+        String key = RedisKeys.getHouseInfoCacheKey(houseId,customerId);
         Map<String, Object> map = redisUtils.hGetAll(key);
         if (!CollectionUtils.isEmpty(map)){
             return ConvertUtils.mapToEntity(map,HouseInfoDTO.class);
         }
         HouseInfoDTO houseInfo = icHouseDao.queryHouseInfoByHouseId(houseId);
         Map<String, Object> result = BeanUtil.beanToMap(houseInfo, false, true);
-        setHouseInfo(houseId,result);
+        setHouseInfo(houseId,result,houseInfo.getCustomerId());
         return houseInfo;
     }
 

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

@@ -61,5 +61,5 @@ public interface HouseService {
 
     void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws  Exception;
 
-    List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIds);
+    List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIds, String customerId);
 }

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

@@ -313,13 +313,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     }*/
 
     @Override
-    public List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIdList) {
+    public List<HouseInfoDTO> queryListHouseInfo(Set<String> houseIdList, String customerId) {
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(houseIdList)){
             return new ArrayList<>();
         }
         List<HouseInfoDTO> result = new ArrayList<>();
         houseIdList.forEach(h -> {
-            result.add(icHouseRedis.getHouseInfo(h));
+            result.add(icHouseRedis.getHouseInfo(h,customerId));
         });
         return result;
     }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -315,6 +315,7 @@
         IFNULL(ih.HOUSE_NAME,'') as HOUSE_NAME,
         IFNULL(ib.LONGITUDE,'') as buildingLongitude,
         IFNULL(ib.LATITUDE,'') as buildingLatitude,
+        ih.CUSTOMER_ID AS customerId,
         concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id )

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

@@ -526,7 +526,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Map<String, AllGridsByUserIdResultDTO> gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, Function.identity()));
 
         //查询房子名称
-        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds);
+        Result<List<HouseInfoDTO>> houseInfoRes=govOrgOpenFeignClient.queryListHouseInfo(houseIds,formDTO.getCustomerId());
         List<HouseInfoDTO> houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>();
         Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
         for (Map<String, Object> resultMap : list) {
@@ -1119,7 +1119,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
         List<PersonWarnRightListResultDTO.PersonWarnRightList> userList = disposeCategory(list, configList);
-        Result<List<HouseInfoDTO>> houseInfosResult = govOrgOpenFeignClient.queryListHouseInfo(userList.stream().distinct().map(m -> m.getHomeId()).collect(Collectors.toSet()));
+        Result<List<HouseInfoDTO>> houseInfosResult = govOrgOpenFeignClient.queryListHouseInfo(userList.stream().distinct().map(m -> m.getHomeId()).collect(Collectors.toSet()),tokenDto.getCustomerId());
         if (!houseInfosResult.success()){
             throw new EpmetException("查询房屋信息失败...");
         }