From dad714704451fbcc04b48d4efcb460410e7a8aa0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Aug 2020 14:47:32 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 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..0db3787 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,33 +719,40 @@
@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);
+ System.out.println(time);
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
Double V=0.0;
+ log.info(deviceAndWinds.size());
+ List list=new ArrayList();
for (DeviceAndWind andWind : deviceAndWinds) {
- List list2=new ArrayList();
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);
laLaMap.put("maxLa",lama);
- laLaMap.put("lami",lami);
-
+ laLaMap.put("minLa",lami);
Double lo1=lomi-250*0.00001141;
Double lo2=loma+250*0.00001141;
@@ -783,11 +790,11 @@
windDir=0.0;
windSpeed=0.0;
}
- Double tvoc=deviceAndWinds.get(j).gettVoc();
+ 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;
}
@@ -801,7 +808,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 +826,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);
@@ -867,11 +869,11 @@
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);
-list.add(laLaMap);
+ list.add(laLaMap);
return list;
}
--
Gitblit v1.8.0