From f0ebb071ac4828e1a5b55eccbba8d8dd9a4d80ad Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 13 Aug 2020 11:26:19 +0800
Subject: [PATCH] 根据臭氧预测算法更新接口
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index dc5a4e2..6fd1dc4 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -719,13 +719,14 @@
@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.size());
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);
@@ -734,17 +735,15 @@
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= (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);
-
+ laLaMap.put("minLa",lami);
Double lo1=lomi-250*0.00001141;
Double lo2=loma+250*0.00001141;
@@ -782,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