From 9125309788deca2a555c4f46c8491a950f8f0692 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Sep 2020 11:00:07 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..f31a2d0 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -876,10 +876,10 @@
@Override
public List byMonitorIdGetDeviceAndWindSpecial(String id, String time, 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;
@@ -913,6 +913,14 @@
}
length=2000;
perdlen=280;
+ }else if(monitorPointId==35){
+ DeviceAndWind deviceAndWind=deviceMapper.getDeviceAndWindByMac("898607b0101730392253",time,tab);
+ DeviceAndWind deviceAndWind1=deviceMapper.getDeviceAndWindByMac("p5dnd7a0392083",time,tab);
+ deviceAndWinds.add(deviceAndWind);
+ deviceAndWinds.add(deviceAndWind1);
+ length=2000;
+ perdlen=50;
+
}else {
deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
length=2000;
@@ -1069,8 +1077,4 @@
return list;
}
- @Override
- public DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table) {
- return deviceMapper.getDeviceAndWindByMac(mac,time,table);
- }
}
--
Gitblit v1.8.0