From d903f312cf6a1d0fc4c5745832a9d6fa681e5141 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 30 Jun 2020 09:16:07 +0800
Subject: [PATCH] update(无组织排放)
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index b3d7066..830090e 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -216,13 +216,22 @@
deviceList = deviceMapper.selectByMap(params);
// loadDeviceState(deviceList);
}
- for(Device d:deviceList){
- if(dv.contains(d.getDeviceVersionId())){
+ Example deviceExample = new Example(Device.class);//���������
+ Example.Criteria deviceCriteria = deviceExample.createCriteria();
+ deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
+ for (Device d : deviceList) {
+ if (dv.contains(d.getDeviceVersionId())) {
d.setHasWindInfo(true);
- }else{
+ } else {
d.setHasWindInfo(false);
}
- }
+ for (Device temp : devicesInfo) {
+ if (d.getId().equals(temp.getId())) {
+ d.setState(temp.getState());
+ }
+ }
+ }
return deviceList;
}
--
Gitblit v1.8.0