From 3c79960dcc900d33b99587e7fb5f1baf46c0a255 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 13:01:23 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 6fd1dc4..0db3787 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -726,19 +726,28 @@
Double U=0.0;
Double V=0.0;
log.info(deviceAndWinds.size());
+ List list=new ArrayList();
for (DeviceAndWind andWind : deviceAndWinds) {
Double lo=andWind.getLongitude();
Double la=andWind.getLatitude();
- List list= LatLngTransformation.Convert_BD09_To_GCJ02(la,lo);
- Double transLo=(Double) list.get(0);
- Double transLa=(Double) list.get(1);
+ List tranlist= LatLngTransformation.Convert_BD09_To_GCJ02(la,lo);
+ Double transLo=(Double) tranlist.get(0);
+ Double transLa=(Double) tranlist.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);
+ Double loma= 0.0;
+ Double lomi= 0.0;
+ Double lama= 0.0;
+ Double lami= 0.0;
+ if (loList.size()>0){
+ loma= (Double) Collections.max(loList);
+ lomi= (Double) Collections.min(loList);
+ }
+ if (laList.size()>0){
+ lama= (Double) Collections.max(laList);
+ lami= (Double) Collections.min(laList);
+ }
Map laLaMap=new HashMap();
laLaMap.put("maxLo",loma);
laLaMap.put("minLo",lomi);
@@ -783,9 +792,9 @@
}
Double tvoc=deviceAndWinds.get(j).getTVoc();
- List list= LatLngTransformation.Convert_BD09_To_GCJ02(deviceAndWinds.get(j).getLatitude(),deviceAndWinds.get(j).getLongitude());
- Double transLo=(Double) list.get(0);
- Double transLa=(Double) list.get(1);
+ List tranlist= LatLngTransformation.Convert_BD09_To_GCJ02(deviceAndWinds.get(j).getLatitude(),deviceAndWinds.get(j).getLongitude());
+ Double transLo=(Double) tranlist.get(0);
+ Double transLa=(Double) tranlist.get(1);
if (tvoc==null){
tvoc=0.0;
}
@@ -860,7 +869,7 @@
List transList= LatLngTransformation.Convert_BD09_To_GCJ02(monitorLa,monitorLo);
Double transLo=(Double) transList.get(0);
Double transLa=(Double) transList.get(1);
- List list=new ArrayList();
+
list.add(jsonArray);
list.add(transLo);
list.add(transLa);
--
Gitblit v1.8.0