修改网格，修改组织后，删除epmet:org:temp:orgtree*相关key

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

@@ -644,8 +644,18 @@ public class RedisKeys {
 	 * @param agencyId
 	 * @return
 	 */
-	public static String getOrgTreeCacheKey(String agencyId) {
-		return rootPrefix.concat("org:temp:orgtree").concat(agencyId);
+	public static String getOrgTreeCacheKey(String agencyId,String customerId) {
+		return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.COLON).concat(agencyId);
+	}
+
+	/**
+	 * 与getOrgTreeCacheKey一致，用于模糊删除
+	 * @param customerId
+	 * @return
+	 */
+	public static String getOrgTreeCachePrexKey(String customerId) {
+		// return "epmet:org:temp:orgtree".concat(StrConstant.STAR);
+		return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.STAR);
 	}
 
 	public static String getHouseInfoCacheKey(String houseId,String customerId){

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

@@ -444,4 +444,15 @@ public class RedisUtils {
     public Long getTTL(String treeCacheKey) {
        return redisTemplate.getExpire(treeCacheKey);
     }
+
+    /**
+     * 根据前缀模糊删除
+     * @param prex
+     */
+    public void deleteByPrex(String prex) {
+        Set<String> keys = redisTemplate.keys(prex);
+        if (!CollectionUtils.isEmpty(keys)) {
+            redisTemplate.delete(keys);
+        }
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -566,7 +566,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         String agencyId = staffInfo.getAgencyId();
         String client = formDTO.getClient();
         //组织缓存key
-        String treeCacheKey = RedisKeys.getOrgTreeCacheKey(agencyId).concat(StrConstant.COLON).concat(client);
+        String treeCacheKey = RedisKeys.getOrgTreeCacheKey(agencyId,tokenDto.getCustomerId()).concat(StrConstant.COLON).concat(client);
         Long expiryTime = redisUtils.getTTL(treeCacheKey);
         List<OrgTreeResultDTO> orgTreeResultDTOS = (List<OrgTreeResultDTO>) redisUtils.get(treeCacheKey);
         //如果接近过期或已经过期且缓存数据不为空 则异步查询

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

@@ -396,7 +396,7 @@ public class CustomerAgencyController {
     @PostMapping("agencygridtree")
     public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
         //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
-        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId(),tokenDTO.getCustomerId()));
     }
 
     /**

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

@@ -92,7 +92,6 @@ public class GridController {
 
         return result;
     }
-
     /**
      * 删除网格
      */

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

@@ -29,7 +29,7 @@ public class ServiceProjectController {
      */
     @RequestMapping("service/serviceScopeTree")
     public Result<ServiceProjectScopeResultDTO> getServiceScopeTree(@LoginUser TokenDto loginInfo) {
-        ServiceProjectScopeResultDTO r = serviceProjectService.getServiceScopeTree(loginInfo.getUserId());
+        ServiceProjectScopeResultDTO r = serviceProjectService.getServiceScopeTree(loginInfo.getUserId(),loginInfo.getCustomerId());
         return new Result<ServiceProjectScopeResultDTO>().ok(r);
     }
 }

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

@@ -26,7 +26,7 @@ public class UserHouseScopeController {
      */
     @RequestMapping("service/serviceScopeTree")
     public Result<UserHouseScopeResultDTO> getServiceScopeTree(@LoginUser TokenDto loginInfo) {
-        UserHouseScopeResultDTO r = userHouseScopeService.getServiceScopeTree(loginInfo.getUserId());
+        UserHouseScopeResultDTO r = userHouseScopeService.getServiceScopeTree(loginInfo.getUserId(),loginInfo.getCustomerId());
         return new Result<UserHouseScopeResultDTO>().ok(r);
     }
 }

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

@@ -59,4 +59,7 @@ public class CustomerAgencyRedis {
         return BeanUtil.mapToBean(resultMap, AgencyInfoCache.class, true);
     }
 
+    public void deleteByPrex(String orgTreeCachePrexKey) {
+        redisUtils.deleteByPrex(orgTreeCachePrexKey);
+    }
 }

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

@@ -24,7 +24,6 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.Map;
@@ -270,7 +269,7 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @param staffId
      * @return
      */
-    AgencyTreeResultDTO getOrgTreeData(String staffId);
+    AgencyTreeResultDTO getOrgTreeData(String staffId,String customerId);
 
     /**
      * @Description 【事件】社区服务热线

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

@@ -1,9 +1,7 @@
 package com.epmet.service;
 
-import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.result.ServiceProjectScopeResultDTO;
-import com.epmet.entity.IcPlaceOrgEntity;
 
 public interface ServiceProjectService {
-     ServiceProjectScopeResultDTO getServiceScopeTree(String staffId);
+     ServiceProjectScopeResultDTO getServiceScopeTree(String staffId,String customerId);
 }

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

@@ -3,5 +3,5 @@ package com.epmet.service;
 import com.epmet.dto.result.UserHouseScopeResultDTO;
 
 public interface UserHouseScopeService {
-     UserHouseScopeResultDTO getServiceScopeTree(String staffId);
+     UserHouseScopeResultDTO getServiceScopeTree(String staffId,String customerId);
 }

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

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
@@ -237,7 +238,9 @@ public class AgencyServiceImpl implements AgencyService {
 
         //5.redis缓存
         customerAgencyRedis.delete(formDTO.getAgencyId());
-
+        //6.一些下拉组织树的缓存要清除掉
+        String orgTreeCachePrexKey = RedisKeys.getOrgTreeCachePrexKey(formDTO.getCustomerId());
+        customerAgencyRedis.deleteByPrex(orgTreeCachePrexKey);
         return result;
     }
 

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

@@ -1175,7 +1175,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
 
     @Override
-    public AgencyTreeResultDTO getOrgTreeData(String staffId) {
+    public AgencyTreeResultDTO getOrgTreeData(String staffId,String customerId) {
         AgencyTreeResultDTO result = new AgencyTreeResultDTO();
         //1.查询工作人员所属组织信息
         AgencyResultDTO rootAgency = baseDao.selectAgencyByStaffId(staffId);
@@ -1191,7 +1191,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setLongitude(rootAgency.getLongitude());
         result.setLatitude(rootAgency.getLatitude());
 
-        String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(rootAgency.getAgencyId());
+        String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(rootAgency.getAgencyId(),customerId);
         Object o = redisUtils.get(orgTreeCacheKey);
         if (o == null){
             ExtStaffPermissionResultDTO res = baseDao.selectAgencyAndGridById(rootAgency.getAgencyId());
@@ -1460,7 +1460,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setLongitude(rootAgency.getLongitude());
         result.setLatitude(rootAgency.getLatitude());
 
-        String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(rootAgency.getId());
+        String orgTreeCacheKey = RedisKeys.getOrgTreeCacheKey(rootAgency.getId(),rootAgency.getCustomerId());
         Object o = redisUtils.get(orgTreeCacheKey);
         if (o == null) {
             ExtStaffPermissionResultDTO res = baseDao.selectAgencyAndGridById(rootAgency.getId());

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

@@ -348,7 +348,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
         customerGridDTO.setCenterAddress(editGridFormDTO.getCenterAddress());
         baseDao.editGrid(customerGridDTO);
-
+        //一些下拉组织树的缓存要清除掉
+        String orgTreeCachePrexKey = RedisKeys.getOrgTreeCachePrexKey(tokenDto.getCustomerId());
+        redisUtils.deleteByPrex(orgTreeCachePrexKey);
         return new Result();
     }
 

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

@@ -1,16 +1,12 @@
 package com.epmet.service.impl;
 
-import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcNeighborHoodDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.result.AgencyTreeResultDTO;
 import com.epmet.dto.result.ServiceProjectScopeResultDTO;
-import com.epmet.entity.CustomerAgencyEntity;
-import com.epmet.entity.IcPlaceOrgEntity;
 import com.epmet.service.CustomerAgencyService;
-import com.epmet.service.NeighborHoodService;
 import com.epmet.service.ServiceProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +38,8 @@ public class ServiceProjectServiceImpl implements ServiceProjectService {
     }
 
     @Override
-    public ServiceProjectScopeResultDTO getServiceScopeTree(String staffId) {
-        AgencyTreeResultDTO orgTreeData = customerAgencyService.getOrgTreeData(staffId);
+    public ServiceProjectScopeResultDTO getServiceScopeTree(String staffId,String customerId) {
+        AgencyTreeResultDTO orgTreeData = customerAgencyService.getOrgTreeData(staffId,customerId);
 
         ServiceProjectScopeResultDTO rootScope = new ServiceProjectScopeResultDTO();
         rootScope.setObjectId(orgTreeData.getAgencyId());

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

@@ -30,8 +30,8 @@ public class UserHouseScopeServiceImpl implements UserHouseScopeService {
     }
 
     @Override
-    public UserHouseScopeResultDTO getServiceScopeTree(String staffId) {
-        AgencyTreeResultDTO orgTreeData = customerAgencyService.getOrgTreeData(staffId);
+    public UserHouseScopeResultDTO getServiceScopeTree(String staffId,String customerId) {
+        AgencyTreeResultDTO orgTreeData = customerAgencyService.getOrgTreeData(staffId,customerId);
 
         UserHouseScopeResultDTO rootScope = new UserHouseScopeResultDTO();
         rootScope.setObjectId(orgTreeData.getAgencyId());