From c0c80bebcc93e90834e06404d6056322e51b02dd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:23:00 +0800
Subject: [PATCH] feat:补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 61acce3..f707242 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
@@ -22,7 +23,6 @@
import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -36,6 +36,8 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -189,7 +191,7 @@
//������������������redis
setDeviceInfoToRedis(mac, deviceInfo);
//������deviceInfo������
- CacheUtils.refreshDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo(mac);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -442,8 +444,9 @@
}
@Override
- public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData) {
- String mac = deviceData.remove("mac").toString();
+ public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code) {
+// String mac = deviceData.remove("mac").toString();
+ String mac = deviceData.get("mac").toString();
//���redis������������������
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
@@ -454,7 +457,7 @@
if (govMpInfo.get("guid") != null) {
aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
}
- return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
+ return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,code);
}
deviceData.remove("DataTime");
return deviceData;
@@ -462,7 +465,8 @@
@Override
public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
- String mac = deviceData.remove("mac").toString();
+// String mac = deviceData.remove("mac").toString();
+ String mac = deviceData.get("mac").toString();
//���redis������������������
Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
if (!ObjectUtils.isEmpty(adjustFormula)) {
@@ -473,7 +477,7 @@
if (ObjectUtils.isEmpty(aqiMap)) {
aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
}
- return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
+ return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
}
deviceData.remove("DataTime");
return deviceData;
@@ -501,7 +505,7 @@
//���������������������������������������������������������������
if (deviceData.get(sensorCode) != null) {
- String sensorValue = (String) deviceData.get(sensorCode);
+ String sensorValue = String.valueOf(deviceData.get(sensorCode));
double value = Double.parseDouble(sensorValue);
if (formula != null) {
//������������������
@@ -620,4 +624,14 @@
organizationUnitAlarmMapper.update(null, deleteWrapper);
}
}
+
+ @Override
+ public void setRedisDevice() {
+ List<Device> list = lambdaQuery().eq(Device::getIsDelete,0).list();
+ for(Device d : list){
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE, d.getMac());
+ Map<String, Object> deviceInfo = selectDeviceInfoById(d.getId());
+ setDeviceInfoToRedis(d.getMac(), deviceInfo);
+ }
+ }
}
--
Gitblit v1.8.0