From db070ecf27c6df1e9f7db15678d4eccab25ef39a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 29 Jul 2021 10:25:47 +0800
Subject: [PATCH] screen-api                 字典类型以及字典数据添加日志功能

---
 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