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 | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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 cc3ce03..830090e 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -206,6 +206,7 @@
*/
@Override
public List<Device> query(Map<String, Object> params) {
+ List<Integer> dv = deviceMapper.getHasWindDirAndWindSpeedDeviceVersion();
Object orgIdObj = params.get("orgId");
List<Device> deviceList = null;
if (orgIdObj != null) {
@@ -214,6 +215,22 @@
params.put("orgIds", orgIds);
deviceList = deviceMapper.selectByMap(params);
// loadDeviceState(deviceList);
+ }
+ 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 {
+ d.setHasWindInfo(false);
+ }
+ for (Device temp : devicesInfo) {
+ if (d.getId().equals(temp.getId())) {
+ d.setState(temp.getState());
+ }
+ }
}
return deviceList;
}
@@ -635,4 +652,19 @@
public List<String> getMacsByOrganizationId(List<Object> organizationIdList) {
return deviceMapper.getMacsByOrganizationId(organizationIdList);
}
+
+ @Override
+ public List<Device> getDeviceById1(int id) {
+ return deviceMapper.getDeviceById1(id);
+ }
+
+ @Override
+ public List<Device> getDeviceById2(int id) {
+ return deviceMapper.getDeviceById2(id);
+ }
+
+ @Override
+ public List<Device> getDeviceById3(int id) {
+ return deviceMapper.getDeviceById3(id);
+ }
}
--
Gitblit v1.8.0