From 06fdc93eac0515be606a2a924550bd477c37ce5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 17 Jul 2020 17:20:10 +0800
Subject: [PATCH] O3预测数据与国控数据对比
---
src/main/java/com/moral/controller/ScreenController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f42bc29..87e0182 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -723,8 +723,8 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
- if(parameters.get("type").equals("day")){
- map.put("time", Integer.valueOf(time)+1);
+ if (parameters.get("type").equals("day")) {
+ map.put("time", Integer.valueOf(time) + 1);
}
map.put("value", map.remove(sensorKey));
}
@@ -1927,8 +1927,8 @@
if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
minAngle = (Double) longAndLatiList.get(j).get("angle");
indexAngle = j;
- }else {
- indexAngle=indexAngle;
+ } else {
+ indexAngle = indexAngle;
}
}
preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
@@ -1960,8 +1960,19 @@
locationList.add(fivethLoction);
String preAngleDeviceString = JSON.toJSON(preAngleDeviceList).toString();
params.put("preAngleDeviceString", preAngleDeviceString);//���������������������������
- params.put("locationList",locationList);
+ params.put("locationList", locationList);
return params;
}
+ @GetMapping("weather_nextDay")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", defaultValue = "6", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������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);
+ parameters.put("typeFormat", "%Y-%m-%d %H");
+ List<Map<String, Object>> resultList = weatherService.getNextDayWeatherDataByRegion(parameters);
+ return new ResultBean<List<Map<String, Object>>>(resultList);
+ }
}
--
Gitblit v1.8.0