From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/util/CacheUtils.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
index 62c0b4f..5f292cf 100644
--- a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
@@ -4,9 +4,11 @@
 import com.moral.api.entity.*;
 import com.moral.api.mapper.DeviceMapper;
 import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
 import com.moral.api.mapper.UnitConversionMapper;
 import com.moral.api.service.SensorService;
 import com.moral.api.service.SysDictDataService;
+import com.moral.api.service.UnitConversionService;
 import com.moral.constant.Constants;
 import com.moral.constant.RedisConstants;
 import com.moral.util.TokenUtils;
@@ -35,11 +37,18 @@
 
     private static DeviceMapper deviceMapper;
 
+    private static SpecialDeviceMapper specialDeviceMapper;
+
     private static SysDictDataService sysDictDataService;
 
     private static UnitConversionMapper unitConversionMapper;
 
     private static SensorService sensorService;
+
+    private static UnitConversionService unitConversionService;
+
+    @Autowired
+    public void setUnitConversionService(UnitConversionService unitConversionService){CacheUtils.unitConversionService = unitConversionService;}
 
     @Autowired
     public void setSensorService(SensorService sensorService) {
@@ -64,6 +73,11 @@
     @Autowired
     public void setUnitConversionMapper(UnitConversionMapper unitConversionMapper) {
         CacheUtils.unitConversionMapper = unitConversionMapper;
+    }
+
+    @Autowired
+    public void setSpecialDeviceMapper(SpecialDeviceMapper specialDeviceMapper) {
+        CacheUtils.specialDeviceMapper = specialDeviceMapper;
     }
 
 
@@ -116,6 +130,55 @@
         redisTemplate.opsForHash().putAll(RedisConstants.DEVICE_INFO,result);
     }
 
+    public static void refreshSpecialDeviceAlarmInfo() {
+        //������������
+        redisTemplate.delete(RedisConstants.SPECIAL_DEVICE_INFO);
+        //������������������
+        List<SpecialDevice> specialDevices = specialDeviceMapper.querySpecialDeviceUnitAlarmInfo();
+        Map<String, SysDictData> unitMap = sysDictDataService.getDictDatasByType("unit");
+        //���������������������������������������������
+        Map<String,SpecialDevice> result = new HashMap<>();
+        for (SpecialDevice specialDevice : specialDevices) {
+            Version version = specialDevice.getVersion();
+            List<Sensor> sensors = version.getSensors();
+            for (Sensor sensor : sensors) {
+                //������������������
+                String unitKey = sensor.getUnitKey();
+                String showUnitKey = sensor.getShowUnitKey();
+                SysDictData unitData = unitMap.get(unitKey);
+                SysDictData showUnitData = unitMap.get(showUnitKey);
+                sensor.setUnit(unitData.getDataValue());
+                sensor.setShowUnit(showUnitData.getDataValue());
+                //������������������
+                Map<String, Sensor> allSensors = sensorService.getAllSensorFromCache();
+                String sensorName = allSensors.get(sensor.getCode()).getName();
+                sensor.setName(sensorName);
+                //������������������
+                if (!unitKey.equals(showUnitKey)) {
+                    QueryWrapper<UnitConversion> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+                    queryWrapper.eq("original_unit_key", unitKey);
+                    queryWrapper.eq("target_unit_key", showUnitKey);
+                    List<UnitConversion> unitConversions = unitConversionMapper.selectList(queryWrapper);
+                    if (unitConversions.size() == 1) {
+                        UnitConversion unitConversion = unitConversions.get(0);
+                        if (ObjectUtils.isEmpty(unitConversion.getSensorCode()))
+                            sensor.setFormula(unitConversion.getFormula());
+
+                    } else {
+                        for (UnitConversion unitConversion : unitConversions) {
+                            if (sensor.getCode().equals(unitConversion.getSensorCode()))
+                                sensor.setFormula(unitConversion.getFormula());
+                        }
+                    }
+                }
+            }
+            result.put(specialDevice.getMac(),specialDevice);
+        }
+        //������redis
+        redisTemplate.opsForHash().putAll(RedisConstants.SPECIAL_DEVICE_INFO,result);
+    }
+
     public static void refreshSensor(){
         sensorService.refreshCache();
     }
@@ -123,4 +186,8 @@
     public static void refreshDicTypeAndData(){
 
     }
+
+    public static void refreshUnitConversion(){
+        unitConversionService.refreshCache();
+    }
 }

--
Gitblit v1.8.0