From e2c9154d3381b365ef4fff5367840725e0c4a57b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:41:54 +0800
Subject: [PATCH] 污染传播接口修改
---
src/main/java/com/moral/controller/ScreenController.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 19f2c5e..0233526 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -10,6 +10,7 @@
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.Month;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -68,6 +69,7 @@
import com.moral.entity.MapBounds;
import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
+import com.moral.entity.Point;
import com.moral.entity.Region;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
@@ -83,6 +85,7 @@
import com.moral.service.DictionaryDataService;
import com.moral.service.HangzhouAqiService;
import com.moral.service.HistoryDailyService;
+import com.moral.service.HistoryHourlyService;
import com.moral.service.HistoryMinutelyService;
import com.moral.service.HistoryService;
import com.moral.service.MachineActivateService;
@@ -141,6 +144,9 @@
*/
@Resource
private DeviceService deviceService;
+
+ @Resource
+ private HistoryHourlyService historyHourlyService;
@Resource
private HistoryMinutelyService historyMinutelyService;
@@ -1218,32 +1224,30 @@
@GetMapping("/pollutionSource")
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mac", value = "������mac������(������p5dnd7a0391972)", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "������������(���������2019-08-22)", required = true, paramType = "query", dataType = "String")})
+ @ApiImplicitParam(name = "mac", value = "������mac������(������898607b0101730392254)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������������������������key(���������e1)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������������(���������2019-09-01-10)", required = true, paramType = "query", dataType = "String")})
public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- LocalDate today=LocalDate.now();
- String time=parameters.get("time").toString();
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDate selectTime = LocalDate.parse(time, dateTimeFormatter);
- LocalDate yesterday=today.minusDays(1);
- LocalDate futureDay=today.plusDays(14);
- Boolean isAfterYesterday=selectTime.isAfter(yesterday)||selectTime.isEqual(yesterday);
- Boolean isAfterFutureDay=selectTime.isAfter(futureDay);
- Map<String, Object> weatherInfoToday=weatherService.getWeatherDataByRegion(parameters);
- Map<String, Object> weatherInfoForecast=new HashMap<>();
- if(isAfterYesterday&&!isAfterFutureDay){
- weatherInfoForecast= weatherService.get15DayWeatherDataByRegion(parameters);
- }
- Boolean isToday=selectTime.isEqual(today);
- String mac=parameters.get("mac").toString();
+ String timeStr = parameters.get("time").toString();
+ String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
+ String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
+ String time = YearAndDay + " " + Hour + ":00:00";
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
+ System.out.println(timeLocalDateTime);
+ int month = timeLocalDateTime.getMonth().getValue();
+ Point dirPoint= historyHourlyService.getDirPoint(parameters);
+ Map<String,Object> getPollutionSourceData=historyHourlyService.getPollutionSourceData(parameters);
+ System.out.println(dirPoint.toString());
+ System.out.println("getPollutionSourceData:"+getPollutionSourceData);
+ String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
- params.put("weatherInfoToday", weatherInfoToday);
- params.put("weatherInfoForecast", weatherInfoForecast);
params.put("device", device);
- params.put("isToday",isToday);
+ params.put("month", month);
+ params.put("dirPoint",dirPoint);
+ params.put("getPollutionSourceData",getPollutionSourceData);
String paramsJson = params.toJSONString();
model.addObject("pollutionSourceParams", paramsJson);
model.setViewName("pollutionsource");
--
Gitblit v1.8.0