From f55f6e05bae945d275101592782fb3b8980d77cf Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 28 Jun 2020 15:26:47 +0800
Subject: [PATCH] update风速风向显示设置

---
 src/main/java/com/moral/controller/ScreenController.java |   89 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 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..8127aaa 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -620,6 +620,15 @@
 
     @RequestMapping(value = "/get-devices", method = RequestMethod.GET)
     @ResponseBody
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "orgId",defaultValue = "5", value = "������Id", required = true, paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Fe", defaultValue = "31.485018",value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Ge", defaultValue = "121.378395",value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Ke", defaultValue = "31.296614",value = "���������������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "Le", defaultValue = "120.59651",value = "���������������", required = true, paramType = "query", dataType = "String")
+    })
     public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
                                  @RequestParam("regionCode") String regionCode) {
         ResultBean<List<Device>> resultBean = new ResultBean();
@@ -1719,7 +1728,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 +1757,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 +1776,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 +1788,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