From 81decd363a1cd1e6af770380745d644f6931d13e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 02 Aug 2021 09:34:59 +0800
Subject: [PATCH] screen-api 修复获取五分钟数据空指针BUG
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 3 +--
1 files changed, 1 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 4ae4498..2995c31 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
@@ -40,8 +40,8 @@
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
QueryWrapper<Device> wrapper = new QueryWrapper();
+ wrapper.eq("monitor_point_id",monitorPointId);
wrapper.eq("is_delete", Constants.NOT_DELETE);
- wrapper.eq("monitor_point_id", monitorPointId);
List<Device> devices = deviceMapper.selectList(wrapper);
return devices;
}
@@ -67,7 +67,6 @@
String end;
String timeUnits;
String dateFormat;
- List<Map<String, Object>> result = new ArrayList<>();
if ("day".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
timeUnits = "hourly";
--
Gitblit v1.8.0