From 2b3c06ae70b16b83063158d092094619579a4d7b Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 27 Oct 2020 14:40:12 +0800
Subject: [PATCH] 风场更新
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 139edf0..52829e6 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -212,6 +212,7 @@
Integer orgId = Integer.parseInt(orgIdObj.toString());
List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId);
params.put("orgIds", orgIds);
+ System.out.println(params);
deviceList = deviceMapper.selectByMap(params);
// loadDeviceState(deviceList);
}
@@ -718,8 +719,8 @@
}
@Override
- public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
- List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
+ public List byMonitorIdGetDeviceAndWind(String id,String tab) {
+ List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),tab);
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
@@ -875,11 +876,11 @@
}
@Override
- public List byMonitorIdGetDeviceAndWindSpecial(String id, String time, String tab) {
-
+ public List byMonitorIdGetDeviceAndWindSpecial(String id, String tab) {
MonitorPoint monitorPoint=monitorPointMapper.byIdGetMonitorPoint(Integer.parseInt(id));
Integer areaCode=monitorPoint.getAreaCode();
String townCode= monitorPoint.getTownCode()+"";
+ int monitorPointId=monitorPoint.getId();
Map<String, Object> parm=new HashMap<>();
List<DeviceAndWind> deviceAndWinds=new ArrayList<>();
Double loma= 0.0;
@@ -894,7 +895,7 @@
List<Device> deviceList=deviceMapper.getDeviceByCode(parm);
for (Device d : deviceList) {
String mac=d.getMac();
- DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,time,tab);
+ DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,tab);
if (deviceAndWind!=null){
deviceAndWinds.add(deviceAndWind);
}
@@ -906,15 +907,23 @@
List<Device> deviceList=deviceMapper.getDeviceByCode(parm);
for (Device d : deviceList) {
String mac=d.getMac();
- DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,time,tab);
+ DeviceAndWind deviceAndWind = deviceMapper.byMacGetDeviceAndWind(mac,tab);
if (deviceAndWind!=null){
deviceAndWinds.add(deviceAndWind);
}
}
length=2000;
perdlen=280;
+ }else if(monitorPointId==35){
+ DeviceAndWind deviceAndWind=deviceMapper.getDeviceAndWindByMac("898607b0101730392253",tab);
+ DeviceAndWind deviceAndWind1=deviceMapper.getDeviceAndWindByMac("p5dnd7a0392083",tab);
+ deviceAndWinds.add(deviceAndWind);
+ deviceAndWinds.add(deviceAndWind1);
+ length=2000;
+ perdlen=50;
+
}else {
- deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
+ deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),tab);
length=2000;
perdlen=80;
}
@@ -1070,7 +1079,13 @@
}
@Override
- public DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table) {
- return deviceMapper.getDeviceAndWindByMac(mac,time,table);
+ public List<Device> getDeviceByCodeAndId(String code, String id) {
+ return deviceMapper.getDeviceByCodeAndId(code,id);
}
+
+ @Override
+ public String byMacGetOrgId(String mac) {
+ return deviceMapper.byMacGetOrgId(mac);
+ }
+
}
--
Gitblit v1.8.0