From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/util/CacheUtils.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 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 4975afd..cecec02 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;
@@ -15,6 +17,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
@@ -35,11 +38,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) {
@@ -66,20 +76,34 @@
CacheUtils.unitConversionMapper = unitConversionMapper;
}
- public static void clearDictionariesCache() {
- redisTemplate.delete(RedisConstants.DICT_DATA_KEY);
- redisTemplate.delete(RedisConstants.DICT_TYPE_KEY);
+ @Autowired
+ public void setSpecialDeviceMapper(SpecialDeviceMapper specialDeviceMapper) {
+ CacheUtils.specialDeviceMapper = specialDeviceMapper;
}
- public static void flushDeviceAlarmInfo() {
- //������������
- redisTemplate.delete(RedisConstants.DEVICE_INFO);
+
+ public static void refreshDeviceAlarmInfo() {
+
+ refreshDeviceAlarmInfo(null);
+
+
+ }
+ public static void refreshDeviceAlarmInfo(String mac){
+ if(StringUtils.isEmpty(mac)){
+ //������������
+ redisTemplate.delete(RedisConstants.DEVICE_INFO);
+ }else {
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE_INFO,mac);
+ }
//������������������
- List<Device> devices = deviceMapper.queryDeviceUnitAlarmInfo();
+ List<Device> devices = deviceMapper.queryDeviceUnitAlarmInfo(mac);
+
Map<String, SysDictData> unitMap = sysDictDataService.getDictDatasByType("unit");
//���������������������������������������������
Map<String,Device> result = new HashMap<>();
+ int i = 0;
for (Device device : devices) {
+ System.out.println(">>>>>>>>>>>:"+(i++));
Version version = device.getVersion();
List<Sensor> sensors = version.getSensors();
for (Sensor sensor : sensors) {
@@ -119,4 +143,67 @@
//������redis
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();
+ }
+
+ public static void refreshDicTypeAndData(){
+
+ }
+
+ public static void refreshUnitConversion(){
+ unitConversionService.refreshCache();
+ }
}
--
Gitblit v1.8.0