From 641b065c69f4311f3ac2b555a9d952e4daab62ad Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 02 Jul 2020 13:28:06 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 773ce10..5394e12 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,16 @@
package com.moral.service.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -29,19 +40,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-
import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
@Service
public class DeviceServiceImpl implements DeviceService {
@@ -207,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,7 +214,23 @@
List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
params.put("orgIds", orgIds);
deviceList = deviceMapper.selectByMap(params);
- loadDeviceState(deviceList);
+ // 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;
}
@@ -631,4 +647,44 @@
}
return null;
}
+
+ @Override
+ 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);
+ }
+
+ @Override
+ public List<Device> queryDevice(Map<String, Object> params) {
+ List<Integer> dv = deviceMapper.getHasWindDirAndWindSpeedDeviceVersion();
+ Object orgIdObj = params.get("orgId");
+ List<Device> deviceList = null;
+ if (orgIdObj != null) {
+ Integer orgId = Integer.parseInt(orgIdObj.toString());
+ List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
+ params.put("orgIds", orgIds);
+ deviceList = deviceMapper.selectDevicesAll(params);
+ }
+ List<Device> deviceListHasWind=new ArrayList<>();
+ for (Device d : deviceList) {
+ if (dv.contains(d.getDeviceVersionId())) {
+ deviceListHasWind.add(d);
+ }
+ }
+ return deviceListHasWind;
+ }
}
--
Gitblit v1.8.0