From 475ec3bd82f7e7f767ca6ba43f3e12b90d3383f1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 08:43:54 +0800
Subject: [PATCH] 风场图update

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 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 dc5a4e2..2e8fae2 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -734,17 +734,35 @@
             loList.add(transLo);
             laList.add(transLa);
         }
-        Double loma= (Double) Collections.max(loList);
-        Double lomi= (Double) Collections.min(loList);
-        Double lama= (Double) Collections.max(laList);
-        Double lami= (Double) Collections.min(laList);
+        Double loma= (Double) loList.get(0);
+        Double lomi= (Double) loList.get(0);
+        Double lama= (Double) laList.get(0);
+        Double lami= (Double) laList.get(0);
+
+        for (int i = 1; i <loList.size() ; i++) {
+            if (loma<=(Double) loList.get(i)){
+                loma=(Double) loList.get(i);
+            }
+            if (lomi>=(Double) loList.get(i)){
+                lomi=(Double) loList.get(i);
+            }
+        }
+
+        for (int i = 1; i <laList.size() ; i++) {
+            if (lama<=(Double) laList.get(i)){
+                lama=(Double) laList.get(i);
+            }
+            if (lami>=(Double) laList.get(i)){
+                lami=(Double) laList.get(i);
+            }
+        }
 
         Map laLaMap=new HashMap();
         laLaMap.put("maxLo",loma);
         laLaMap.put("minLo",lomi);
         laLaMap.put("maxLa",lama);
         laLaMap.put("lami",lami);
-
+        System.out.println(laLaMap);
 
         Double lo1=lomi-250*0.00001141;
         Double lo2=loma+250*0.00001141;

--
Gitblit v1.8.0