From a3ff4d366c6654e5cd139f74a0104d7e9a9fa0c9 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 15:55:36 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/ScreenController.java | 26 +++++++++++++++++++++++---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 3 +--
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index af3fd34..f0d2f66 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1975,8 +1975,8 @@
@GetMapping("/windAndDeviceData")
@ResponseBody
- public List windAndDeviceData(/*String monitorPointId*/) {
- String monitorPointId="539";
+ public Map<String, List> windAndDeviceData() {
+ /*String monitorPointId="539";
Calendar c = Calendar.getInstance();//������������������������������������ ������������������������������
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH);
@@ -2010,7 +2010,27 @@
String time=year + "-" + mon + "-" + dt + " " +hu + ":" +mu + ":" + "00";
String table="history_minutely_"+year+mon;
List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
- return list;
+ return list;*/
+ List<String> macList=deviceService.getAllMac();
+ Map<String,List> latlngMap=new HashMap<String,List>();
+ Map devMap=null;
+ List list=new ArrayList();
+ for (String mac : macList) {
+ devMap=new HashMap();
+ if (mac!=null){
+ Device device=deviceService.byMacGetDevice(mac);
+ List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
+ devMap.put("lat",list1.get(1));
+ devMap.put("lng",list1.get(0));
+ devMap.put("monitorPointId",device.getMonitorPointId());
+ //System.out.println(device);
+ list.add(devMap);
+ }else {
+ continue;
+ }
+ }
+ latlngMap.put("latlng",list);
+ return latlngMap;
}
@GetMapping("forecastO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 3eed336..dc5a4e2 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -720,7 +720,6 @@
@Override
public List byMonitorIdGetDeviceAndWind(String id,String time,String tab) {
List<DeviceAndWind> deviceAndWinds=deviceMapper.byMonitorIdGetDeviceAndWind(id,time,tab);
- List list1=new ArrayList();
List loList=new ArrayList();
List laList=new ArrayList();
Double U=0.0;
@@ -866,7 +865,7 @@
list.add(jsonArray);
list.add(transLo);
list.add(transLa);
-list.add(laLaMap);
+ list.add(laLaMap);
return list;
}
--
Gitblit v1.8.0