From 7c32c8a9ec7943112360adc839e5292be40db74d Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 24 Aug 2020 16:07:48 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/controller/ScreenController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index af81612..867b4ec 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1959,6 +1959,9 @@
if (mac!=null){
Device device=deviceService.byMacGetDevice(mac);
List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
+ if (device.getState()!=4+""){
+ devMap.put("state",device.getState());
+ }
devMap.put("lat",list1.get(1));
devMap.put("lng",list1.get(0));
devMap.put("monitorPointId",device.getMonitorPointId());
@@ -1990,8 +1993,6 @@
mon=""+month;
}
String table="history_minutely_"+year+mon;
- log.info(table);
- log.info(time);
List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
return list;
}
@@ -2021,7 +2022,7 @@
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "���������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "time", value = "���6���(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
--
Gitblit v1.8.0