From 148727793cc4ab3e7038c1bdcd6a217217b37e03 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 22 Aug 2019 16:55:42 +0800
Subject: [PATCH] 添加污染传播来源接口
---
src/main/java/com/moral/controller/ScreenController.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 263bac6..19f2c5e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -8,6 +8,9 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -1200,7 +1203,7 @@
params.put("sensorsMap",sensorsMap);
String paramsJson = params.toJSONString();
model.addObject("uavTrajectoryParams", paramsJson);
- model.setViewName("uavTrajectory");
+ model.setViewName("uavtrajectory");
return model;
} else {
StringBuilder msg = new StringBuilder();
@@ -1212,4 +1215,39 @@
}
}
+ @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")})
+ 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();
+ 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);
+ String paramsJson = params.toJSONString();
+ model.addObject("pollutionSourceParams", paramsJson);
+ model.setViewName("pollutionsource");
+ return model;
+ }
+
}
--
Gitblit v1.8.0