From 85fc9222817d21d309eaa5dae127d235c309d1e9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Oct 2022 11:01:04 +0800
Subject: [PATCH] 修改浑南区同比数据
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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..61acce3 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
@@ -498,19 +498,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) 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 +524,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 +549,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