From 72bfd6cfe47b48a183ea3795054dabdcffb543d7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:22:23 +0800
Subject: [PATCH] 风场图update

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f68a409..53e3cc1 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,33 +719,67 @@
 
     @Override
     public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
-        List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(id,time,tab);
-        List list1=new ArrayList();
+
+        List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(Integer.parseInt(id),time,tab);
         List loList=new ArrayList();
         List laList=new ArrayList();
         Double U=0.0;
         Double V=0.0;
+        log.info("id="+id);
+        log.info("time="+time);
+        log.info("tab="+tab);
+        log.info("deviceAndWinds="+deviceAndWinds);
         for (DeviceAndWind andWind : deviceAndWinds) {
-            List list2=new ArrayList();
             Double lo=andWind.getLongitude();
             Double la=andWind.getLatitude();
+            log.info("lo="+lo);
             List list= LatLngTransformation.Convert_BD09_To_GCJ02(la,lo);
+            log.info("list2="+list);
             Double transLo=(Double) list.get(0);
             Double transLa=(Double) list.get(1);
             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);
+        log.info(loList.size());
+        log.info(loList);
+        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);
+            }
+            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;
@@ -801,7 +835,6 @@
             map.put("V",V);
             mapList.add(map);
         }
-        System.out.println(mapList);
         for (int i = 0; i <mapList.size() ; i++) {
             Double lo= (Double) mapList.get(i).get("lo");
             Double la= (Double) mapList.get(i).get("la");
@@ -820,11 +853,7 @@
                 if (i==0){
                     if ((y>=2 && j==(y)*nx+x)){
                         int k;
-                        System.out.println(nx*ny);
                         for (k = j-2*nx; k <=j+2*nx ;k=k+nx) {
-                            System.out.println(k);
-                            System.out.println("----------------");
-                            System.out.println(uList.size());
                             uList.set(k,U);
                             uList.set(k-1,U);
                             uList.set(k-2,U);
@@ -871,7 +900,7 @@
         list.add(jsonArray);
         list.add(transLo);
         list.add(transLa);
-list.add(laLaMap);
+        list.add(laLaMap);
         return list;
     }
 

--
Gitblit v1.8.0