From 9880d87f87b074b45150a66867c0d1870e6cb3e2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 06 Aug 2020 14:31:13 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 5394e12..df90666 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -23,6 +23,7 @@
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Device;
import com.moral.entity.DeviceProperty;
+import com.moral.entity.MonitorPoint;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.DevicePropertyMapper;
import com.moral.mapper.DeviceVersionMapper;
@@ -220,6 +221,10 @@
Example.Criteria deviceCriteria = deviceExample.createCriteria();
deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
+ Example monitorExample = new Example(MonitorPoint.class);//���������
+ Example.Criteria monitorCriteria = monitorExample.createCriteria();
+ monitorCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ List<MonitorPoint> monitorsInfo = monitorPointMapper.selectByExample(monitorExample);
for (Device d : deviceList) {
if (dv.contains(d.getDeviceVersionId())) {
d.setHasWindInfo(true);
@@ -231,6 +236,11 @@
d.setState(temp.getState());
}
}
+ for (MonitorPoint mp : monitorsInfo) {
+ if (d.getMonitorPointId().equals(mp.getId())) {
+ d.setMonitorPoint(mp);
+ }
+ }
}
return deviceList;
}
--
Gitblit v1.8.0