Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java

@@ -96,7 +96,7 @@ public class GovCustomerMenuRedis {
      */
     public void delAllCustomerMenu(String customerId) {
         String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
-        redisUtils.delete(key);
+        redisUtils.deleteByPattern(key);
     }
 
     private boolean checkParam(String customerId, Integer type) {

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java

@@ -78,9 +78,9 @@ public class GovCustomerMenuRedis {
         redisUtils.deleteByPattern(key);
     }
 
-    public void delAllCustomerMenuFiveCoverage(String customerId){
+    public void delAllCustomerMenuFiveCoverage(){
-        String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
+        String key = RedisKeys.getCustomerMenuListFiveCoverage().concat("*");
-        redisUtils.delete(key);
+        redisUtils.deleteByPattern(key);
     }
 
     private boolean checkParam(String customerId, Integer type) {

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java

@@ -115,10 +115,10 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
                 entity.setCustomerId(customerId);
                 entity.setTableId(formDTO.getTableId());
                 entities.add(entity);
-                govCustomerMenuRedis.delAllCustomerMenuFiveCoverage(customerId);
             }
             insertBatch(entities);
         }
+        govCustomerMenuRedis.delAllCustomerMenuFiveCoverage();
         //删除全部客户缓存
         govCustomerMenuRedis.delAllCustomerMenu();
     }