From f2cf93a2e2ac0c30ea4aa65f707a71fcee63f1c9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 05 Aug 2021 13:55:22 +0800
Subject: [PATCH] screen-manage                  更改因子修改代码刷新缓存逻辑

---
 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index a8323c5..c618490 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -140,9 +140,9 @@
             OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
             organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
             organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
-            //������deviceInfo������
-            CacheUtils.flushDeviceAlarmInfo();
         }
+        //������deviceInfo������
+        CacheUtils.refreshDeviceAlarmInfo();
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String content = "������������:"+oldSensor.getName()+";";
         for (Object key:updateSensorMap.keySet()) {
@@ -359,6 +359,12 @@
         return sensors;
     }
 
+    @Override
+    public void refreshCache(){
+        Map<String, Sensor> sensors = getAllSensorFromDB();
+        refreshCache(sensors);
+    }
+
     private Map<String,Sensor> getAllSensorFromDB(){
         QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
         wrapper.eq("is_delete",Constants.NOT_DELETE);
@@ -368,11 +374,6 @@
             result.put(sensor.getCode(),sensor);
         }
         return result;
-    }
-
-    private void refreshCache(){
-        Map<String, Sensor> sensors = getAllSensorFromDB();
-        refreshCache(sensors);
     }
 
     private void refreshCache(Map<String,Sensor> sensors){

--
Gitblit v1.8.0