From 35ca4aa6343baec6c2c949cac7ab682c09a371e3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 11 Jul 2023 13:48:46 +0800
Subject: [PATCH] chore: 提交测试
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 d4269f1..a747d6e 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
@@ -22,7 +22,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 +35,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;
@@ -442,8 +443,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 +456,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 +464,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 +476,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;
@@ -498,19 +501,21 @@
String sensorCode = sensor.getCode();
//������������
String formula = sensor.getFormula();
- //������������������������
- String sensorValue = (String) deviceData.get(sensorCode);
- double value = Double.parseDouble(sensorValue);
- //������������
- if (formula != null) {
- //������������������
- sensorValue = formula.replace("{0}", sensorValue);
- expression = AviatorEvaluator.compile(sensorValue);
- value = Double.parseDouble(expression.execute().toString());
- }
- int sensorState = judgeState(list, value);
- if (sensorState > state) {
- state = sensorState;
+
+ //���������������������������������������������������������������
+ if (deviceData.get(sensorCode) != null) {
+ String sensorValue = String.valueOf(deviceData.get(sensorCode));
+ double value = Double.parseDouble(sensorValue);
+ if (formula != null) {
+ //������������������
+ sensorValue = formula.replace("{0}", sensorValue);
+ expression = AviatorEvaluator.compile(sensorValue);
+ value = Double.parseDouble(expression.execute().toString());
+ }
+ int sensorState = judgeState(list, value);
+ if (sensorState > state) {
+ state = sensorState;
+ }
}
}
//������������������
@@ -522,20 +527,20 @@
@Override
public List<Map<String, Object>> selectMonitorPiontAndDeviceByOrgId(int orgId) {
QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
- monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
- monitorPointQueryWrapper.eq("organization_id",orgId);
+ monitorPointQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("organization_id", orgId);
List<MonitorPoint> monitorPointList = monitorPointMapper.selectList(monitorPointQueryWrapper);
List<Map<String, Object>> resultList = new ArrayList<>();
- for (MonitorPoint monitorPoint:monitorPointList) {
- Map<String,Object> resultMap = new HashMap<>();
+ for (MonitorPoint monitorPoint : monitorPointList) {
+ Map<String, Object> resultMap = new HashMap<>();
resultMap = JSON.parseObject(JSON.toJSONString(monitorPoint), Map.class);
int mp_id = monitorPoint.getId();
QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
deviceQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
- deviceQueryWrapper.eq("monitor_point_id",mp_id);
+ deviceQueryWrapper.eq("monitor_point_id", mp_id);
List<Device> devices = new ArrayList<>();
devices = deviceMapper.selectList(deviceQueryWrapper);
- resultMap.put("devices",devices);
+ resultMap.put("devices", devices);
resultList.add(resultMap);
}
return resultList;
@@ -547,7 +552,7 @@
for (int i = levels.size() - 1; i >= 0; i--) {
Double level = Double.parseDouble(levels.get(i).toString());
if (data >= level) {
- state = i + 1;
+ state = i + 2;
break;
}
}
--
Gitblit v1.8.0