Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线开发

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -34,6 +34,7 @@ public class CustomerOrgRedis {
 
     private static CustomerOrgRedis customerOrgRedis;
 
+
     @PostConstruct
     public void init() {
         customerOrgRedis = this;
@@ -90,4 +91,13 @@ public class CustomerOrgRedis {
         return agencyInfoResult.getData();
     }
 
+    /**
+     * desc:删除网格缓存
+     * @param gridId
+     */
+    public static void delGridInfo(String gridId) {
+        String key = RedisKeys.getGridInfoKey(gridId);
+        customerOrgRedis.redisUtils.delete(key);
+    }
+
 }

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

@@ -998,6 +998,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         updateGrid.set(CustomerGridEntity::getAbandonFlag,true);
         updateGrid.eq(CustomerGridEntity::getId,formDTO.getGridId());
         baseDao.update(null,updateGrid);
+        CustomerOrgRedis.delGridInfo(formDTO.getGridId());
     }
 
     @Override