From a0b7214e89c4abd596ce8ad5ab115e9c7ea3dcda Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 10:12:56 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 52 ++++++++--------------------------------------------
1 files changed, 8 insertions(+), 44 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..6fd1dc4 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,67 +719,31 @@
@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());
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);
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;
-
-
- 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);
- }
- }
-
+ Double loma= (Double) Collections.max(loList);
+ Double lomi= (Double) Collections.min(loList);
+ Double lama= (Double) Collections.max(laList);
+ Double 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);
- System.out.println(laLaMap);
+ laLaMap.put("minLa",lami);
Double lo1=lomi-250*0.00001141;
Double lo2=loma+250*0.00001141;
@@ -817,7 +781,7 @@
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);
--
Gitblit v1.8.0