From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 25 Aug 2023 14:12:48 +0800 Subject: [PATCH] chore:过滤海城小时数据 --- screen-manage/src/main/java/com/moral/api/util/CacheUtils.java | 84 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 80 insertions(+), 4 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 8fa6e54..4d6e791 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) { @@ -66,17 +75,23 @@ 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 flushDeviceAlarmUnit() { + + public static void refreshDeviceAlarmInfo() { + //������������ + redisTemplate.delete(RedisConstants.DEVICE_INFO); + //������������������ List<Device> devices = deviceMapper.queryDeviceUnitAlarmInfo(); 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) { @@ -116,4 +131,65 @@ //������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