From eca101124f17c62607a007ee34bf1ccd72a3c566 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 24 Jun 2020 09:19:22 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d8ebe59..030a524 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1719,7 +1719,7 @@
params.put("unit",parameters.get("unit"));
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
- model.addObject("uavDroppointParams", paramsJson);
+ model.addObject("uavChannelParams", paramsJson);
model.setViewName("uavchannel");
return model;
} else {
@@ -1748,8 +1748,8 @@
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);
+ int endHourValue = Integer.parseInt(endHour);
+ int startHourValue = Integer.parseInt(startHour);
if (endHourValue <= startHourValue) {
endHourValue = startHourValue + 1;
}
@@ -1767,7 +1767,7 @@
params.put("unit",parameters.get("unit"));
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
- model.addObject("uavDroppointParams", paramsJson);
+ model.addObject("uavTracingParams", paramsJson);
model.setViewName("uavtracing");
return model;
} else {
@@ -1779,4 +1779,76 @@
return model;
}
}
+
+ @GetMapping("/purify")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView PurificationRate(HttpServletRequest request,ModelAndView model){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS= (String) parameters.get("monitorPointId");
+ String sensor= (String) parameters.get("sensorKey");
+ String time= (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+ int monitPointId=Integer.parseInt(monitPointIdS);
+ JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,1,sensor);
+ String paramsJson = params.toJSONString();
+ model.addObject("mapParams", paramsJson);
+ model.setViewName("purityMap");
+ return model;
+ }
+
+
+ @GetMapping("/collection")
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView collectionRate(HttpServletRequest request,ModelAndView model){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS= (String) parameters.get("monitorPointId");
+ String sensor= "";
+ String time= (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+ int monitPointId=Integer.parseInt(monitPointIdS);
+ //������������������
+ JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,2,sensor);
+ model.addObject("params",params);
+ model.setViewName("pressureMap");
+ return model;
+ }
+
+
+
+ @GetMapping("/unorganizedEmissions")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPointId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "������", required = true, paramType = "query", dataType = "String"),
+ // @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String")})
+ public ModelAndView unorganizedEmissions(HttpServletRequest request,ModelAndView model){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitPointIdS= (String) parameters.get("monitorPointId");
+ String sensor= (String) parameters.get("sensorKey");
+ String time= (String) parameters.get("time");
+ String YearAndDay = time.substring(0, time.lastIndexOf("-"));
+ String Hour = time.substring(time.lastIndexOf("-") + 1);
+ String Time = YearAndDay + " " + Hour + ":00:00";
+
+
+ int monitPointId=Integer.parseInt(monitPointIdS);
+ //������������������
+ JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,3,sensor);
+ model.addObject("params",params);
+ model.setViewName("unorganizedMap");
+ return model;
+ }
+
}
--
Gitblit v1.8.0