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 | 67 ++++++++++-----------------------
1 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 53e3cc1..0db3787 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,67 +719,40 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
-
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("id="+id);
- log.info("time="+time);
- log.info("tab="+tab);
- log.info("deviceAndWinds="+deviceAndWinds);
+ log.info(deviceAndWinds.size());
+ List list=new ArrayList();
for (DeviceAndWind andWind : deviceAndWinds) {
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);
+ 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);
}
- log.info(loList.size());
- log.info(loList);
- Double loma=0.0;
- Double lomi=0.0;
- Double lama=0.0;
- Double lami=0.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);
+ loma= (Double) Collections.max(loList);
+ lomi= (Double) Collections.min(loList);
}
if (laList.size()>0){
- lama= (Double) laList.get(0);
- lami= (Double) laList.get(0);
+ lama= (Double) Collections.max(laList);
+ lami= (Double) Collections.min(laList);
}
- 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);
+ laLaMap.put("minLa",lami);
Double lo1=lomi-250*0.00001141;
Double lo2=loma+250*0.00001141;
@@ -817,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;
}
@@ -896,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