From a167b6bd38275208b32d85c3d3348ee3df58ac30 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Sat, 3 Dec 2022 10:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=B8=97=E6=B5=81=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0redis=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/zhdbaqapi/constant/Constants.java |  1 +
 .../service/impl/DeviceSLInfoServiceimpl.java  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whdc/zhdbaqapi/constant/Constants.java b/src/main/java/com/whdc/zhdbaqapi/constant/Constants.java
index 39af744..b4a7968 100644
--- a/src/main/java/com/whdc/zhdbaqapi/constant/Constants.java
+++ b/src/main/java/com/whdc/zhdbaqapi/constant/Constants.java
@@ -9,5 +9,6 @@ public class Constants {
 
 
     public static final String CACHE_NAME = "DeviceInfoListAll";
+    public static final String CACHE_NAME_SL = "DeviceSLInfoListAll";
 
 }
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
index b884e9b..0475fae 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceSLInfoServiceimpl.java
@@ -56,7 +56,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+    @CacheEvict(Constants.CACHE_NAME_SL)
     public boolean save(DeviceSLInfo entity) {
         if (baseMapper.checkValidStationCode(entity.getStationCode()) != null) {
             throw new MyException("stationCode=" + entity.getStationCode() + " 已被其他有效数据使用，不能恢复");
@@ -67,7 +67,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+    @CacheEvict(Constants.CACHE_NAME_SL)
     public boolean updateById(DeviceSLInfo entity) {
         DeviceSLInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
         if (old == null) {
@@ -89,24 +89,24 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
             entity.setLatestReportingTime(new Date(defaultTimeStamp));
             deviceDataMapper.clearByDeviceId(entity.getDeviceId(), entity.getChannelNum());
         }
-        redisTemplate.delete(Constants.CACHE_NAME);
+        redisTemplate.delete(Constants.CACHE_NAME_SL);
         return super.updateById(entity);
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+    @CacheEvict(Constants.CACHE_NAME_SL)
     public boolean updateByIdInternal(DeviceSLInfo entity) {
         DeviceSLInfo old = baseMapper.checkValidStationCode(entity.getStationCode());
         if (old != null && !old.getId().equals(entity.getId())) {
             throw new MyException("stationCode=" + entity.getStationCode() + " 已被其他有效数据使用，不能恢复");
         }
         entity.setModificationTime(new Date());
-        redisTemplate.delete(Constants.CACHE_NAME);
+        redisTemplate.delete(Constants.CACHE_NAME_SL);
         return super.updateById(entity);
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+    @CacheEvict(Constants.CACHE_NAME_SL)
     public boolean removeById(Serializable id) {
         DeviceSLInfo entity = baseMapper.selectById(id);
         entity.setDel(1);
@@ -114,7 +114,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @CacheEvict(Constants.CACHE_NAME)
+    @CacheEvict(Constants.CACHE_NAME_SL)
     public boolean restore(Integer id) {
         DeviceSLInfo entity = baseMapper.selectById(id);
 
@@ -136,7 +136,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
     }
 
     @Override
-    @Cacheable(Constants.CACHE_NAME)
+    @Cacheable(Constants.CACHE_NAME_SL)
     public List<DeviceSLInfo> listAll() {
         return baseMapper.listAll();
     }
@@ -222,7 +222,7 @@ public class DeviceSLInfoServiceimpl extends ServiceImpl<DeviceSLInfoMapper, Dev
 
     @Override
     public void clearCache() {
-        Set<String> keys = redisTemplate.keys(Constants.CACHE_NAME + "*");
+        Set<String> keys = redisTemplate.keys(Constants.CACHE_NAME_SL + "*");
         for (String k : keys) {
             redisTemplate.delete(k);
         }