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, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a21df60..0233526 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -8,6 +8,10 @@
import java.io.InputStream;
import java.io.InputStreamReader;
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;
import java.util.Collection;
@@ -65,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;
@@ -80,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;
@@ -138,6 +144,9 @@
*/
@Resource
private DeviceService deviceService;
+
+ @Resource
+ private HistoryHourlyService historyHourlyService;
@Resource
private HistoryMinutelyService historyMinutelyService;
@@ -1184,6 +1193,7 @@
String mac = parameters.get("mac").toString();
if (mac != null && mac.length() != 0) {
List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
List<Map<String, Object>> sensorList = new ArrayList<>();
List<Map<String, Object>> sensorListMin = new ArrayList<>();
List<Map<String, Object>> sensorListMax = new ArrayList<>();
@@ -1196,9 +1206,10 @@
params.put("sensorInfo", sensorList);
params.put("sensorInfoMin", sensorListMin);
params.put("sensorInfoMax", sensorListMax);
+ 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();
@@ -1210,4 +1221,37 @@
}
}
+ @GetMapping("/pollutionSource")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @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);
+ 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("device", device);
+ params.put("month", month);
+ params.put("dirPoint",dirPoint);
+ params.put("getPollutionSourceData",getPollutionSourceData);
+ String paramsJson = params.toJSONString();
+ model.addObject("pollutionSourceParams", paramsJson);
+ model.setViewName("pollutionsource");
+ return model;
+ }
+
}
--
Gitblit v1.8.0