From cc2e35bac3aca6d98b337a0b306c279f036ce989 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Sep 2023 11:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0a1b3c9..bd62813 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -71,6 +71,15 @@
}
@Override
+ public List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId) {
+ QueryWrapper<Device> wrapper = new QueryWrapper();
+ wrapper.in("monitor_point_id", monitorPointId);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.orderByAsc("dev_num");
+ return deviceMapper.selectList(wrapper);
+ }
+
+ @Override
public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
List<String> sensorCodes = Arrays.asList(Constants.SENSOR_CODE_PM25
, Constants.SENSOR_CODE_PM10
@@ -196,6 +205,7 @@
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
queryWrapper.select("mac", "name").in("mac", macs);
+ queryWrapper.orderByAsc("dev_num","name","id");
List<Device> devices = deviceMapper.selectList(queryWrapper);
Map<String,Object> devicesInfo = new HashMap<>();
for (Device device:devices) {
@@ -237,8 +247,8 @@
for (HistoryHourly historyHourly:distinctHistoryHourlies) {
Map<String,Object> historyHourlyMap = new HashMap<>();
historyHourlyMap.put("mac",mac);
- JSONObject value = JSONObject.parseObject(historyHourly.getValue());
- Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+ JSONObject value= JSONObject.parseObject(historyHourly.getValue());
+ Double sensorValue = Objects.nonNull(value)&&Objects.nonNull(value.get(sensorCode))?Double.parseDouble(value.get(sensorCode).toString()):0d;
historyHourlyMap.put(sensorCode,sensorValue);
Date time = historyHourly.getTime();
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_EN);
--
Gitblit v1.8.0