From 27421fc5caadacc138db507bffae56a833555761 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 16:00:30 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/ScreenController.java | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f0d2f66..cbdb6e6 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 Map<String, List> windAndDeviceData() {
- /*String monitorPointId="539";
+ public List windAndDeviceData() {
+ String monitorPointId="539";
Calendar c = Calendar.getInstance();//������������������������������������ ������������������������������
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH);
@@ -2010,27 +2010,7 @@
String time=year + "-" + mon + "-" + dt + " " +hu + ":" +mu + ":" + "00";
String table="history_minutely_"+year+mon;
List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
- 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;
+ return list;
}
@GetMapping("forecastO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
--
Gitblit v1.8.0