From 43b45a739b9e17171f057f538dfbaa4c2f0e359d Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:47:16 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 7e46e52..6ef4f98 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,25 +719,33 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
- List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(id,time,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("deviceAndWinds="+deviceAndWinds.size());
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);
}
+ 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);
@@ -807,7 +815,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