From 1400ab5fe5b5919a147538934d95d93b8a1379dc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:04:52 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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 2e8fae2..0c74fde 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,6 +719,7 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
+
List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(id,time,tab);
List loList=new ArrayList();
List laList=new ArrayList();
@@ -732,13 +733,24 @@
Double transLo=(Double) list.get(0);
Double transLa=(Double) list.get(1);
loList.add(transLo);
+ log.info(loList.size());
+ log.info(loList);
laList.add(transLa);
}
- Double loma= (Double) loList.get(0);
- Double lomi= (Double) loList.get(0);
- Double lama= (Double) laList.get(0);
- Double lami= (Double) laList.get(0);
+ Double loma=0.0;
+ Double lomi=0.0;
+ Double lama=0.0;
+ Double lami=0.0;
+
+ if (loList.size()>0){
+ loma= (Double) loList.get(0);
+ lomi= (Double) loList.get(0);
+ }
+ if (laList.size()>0){
+ lama= (Double) laList.get(0);
+ lami= (Double) laList.get(0);
+ }
for (int i = 1; i <loList.size() ; i++) {
if (loma<=(Double) loList.get(i)){
loma=(Double) loList.get(i);
--
Gitblit v1.8.0