From 21bc39e477ebf9421378aed76062e2be1f1e7f9e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 19 Jun 2020 10:26:30 +0800
Subject: [PATCH] 无人机落点，污染源通道，溯源应用
---
src/main/java/com/moral/controller/ScreenController.java | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 151 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 23c06ea..d8ebe59 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -929,12 +929,12 @@
}
}
- for (int i = 0; i <resultList.size() ; i++) {
+ for (int i = 0; i < resultList.size(); i++) {
if (resultList.get(i) == null) {
Map<String, Object> hashMap = new HashMap<>();
- if(type.equals("day")){
+ if (type.equals("day")) {
hashMap.put("time", i);
- }else {
+ } else {
hashMap.put("time", i + 1);
}
hashMap.put(s, "");
@@ -961,15 +961,15 @@
ArrayList<String> values = new ArrayList<>();
values.add(map.remove(s).toString());
values.add("");
- map.put("values",values);
+ map.put("values", values);
}
}
Iterator<Map<String, Object>> it = resultList.iterator();
- while(it.hasNext()){
+ while (it.hasNext()) {
Map<String, Object> next = it.next();
- ArrayList<String> values = (ArrayList<String>)next.get("values");
- if(values.get(0).equals("")&&values.get(1).equals("")){
+ ArrayList<String> values = (ArrayList<String>) next.get("values");
+ if (values.get(0).equals("") && values.get(1).equals("")) {
it.remove();
}
}
@@ -1635,4 +1635,148 @@
return model;
}
}
+
+ @GetMapping("/uavDroppoint")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavDroppoint(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey",parameters.get("sensorKey"));
+ params.put("unit",parameters.get("unit"));
+ params.put("description",parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavDroppointParams", paramsJson);
+ model.setViewName("uavdroppoint");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/uavChannel")
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavChannel(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey",parameters.get("sensorKey"));
+ params.put("unit",parameters.get("unit"));
+ params.put("description",parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavDroppointParams", paramsJson);
+ model.setViewName("uavchannel");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
+
+ @GetMapping("/uavTracing")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17-17)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17-18)", required = true, paramType = "query", dataType = "String")
+ })
+ public ModelAndView uavTracing(ModelAndView model, HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String st = parameters.get("startTime").toString();
+ String startYearAndDay = st.substring(0, st.lastIndexOf("-"));
+ String startHour = st.substring(st.lastIndexOf("-") + 1);
+ String startTime = startYearAndDay + " " + startHour + ":00:00";
+ String et = parameters.get("endTime").toString();
+ String endHour = et.substring(et.lastIndexOf("-") + 1);
+ int endHourValue = Integer.valueOf(endHour);
+ int startHourValue = Integer.valueOf(startHour);
+ if (endHourValue <= startHourValue) {
+ endHourValue = startHourValue + 1;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ parameters.put("startTime", startTime);
+ parameters.put("endTime", endTime);
+ String mac = parameters.get("mac").toString();
+ if (mac != null && mac.length() != 0) {
+ List<Map<String, Object>> sensorData = historyService.getUavSensorData(parameters);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
+ JSONObject params = new JSONObject();
+ params.put("sensorInfo", sensorData);
+ params.put("sensorsMap", sensorsMap);
+ params.put("sensorKey",parameters.get("sensorKey"));
+ params.put("unit",parameters.get("unit"));
+ params.put("description",parameters.get("description"));
+ String paramsJson = params.toJSONString();
+ model.addObject("uavDroppointParams", paramsJson);
+ model.setViewName("uavtracing");
+ return model;
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] mac:");
+ msg.append(mac);
+ log.warn(msg);
+ model.setViewName("403");
+ return model;
+ }
+ }
}
--
Gitblit v1.8.0