From 0c99deb331cb0aa749f3b7c7d802d64d67672685 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:41 +0800
Subject: [PATCH] B/S获取传感器平均值测试

---
 src/main/java/com/moral/controller/ScreenController.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 867b4ec..11141a5 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -88,7 +88,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import org.xml.sax.InputSource;
-
 import static com.moral.common.util.ResourceUtil.getValue;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 import static java.util.Calendar.*;
@@ -175,6 +174,7 @@
 
     @Resource
     private QualityDailyService qualityDailyService;
+
 
     /**
      * Screen login. ������������
@@ -695,6 +695,7 @@
     public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
             throws Exception {
         Map<String, Object> parameters = getParametersStartingWith(request, null);
+        //������������������������������������������������
         ParameterUtils.getTimeType4Time(parameters);
         parameters.put("monitorPointId", parameters.remove("monitorPoint"));
         Object sensorKey = parameters.remove("sensorKey");
@@ -713,6 +714,9 @@
         }
         return new ResultBean<List<Map<String, Object>>>(list);
     }
+
+
+
 
     @GetMapping("report_alarm_datas")
     public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
@@ -1996,6 +2000,8 @@
         List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
         return list;
     }
+
+    //������������
     @GetMapping("/windAndDeviceDataByArea")
     @ResponseBody
     public List windAndDeviceDataByArea(String monitorPointId) {
@@ -2012,8 +2018,6 @@
             mon=""+month;
         }
         String table="history_minutely_"+year+mon;
-        log.info(table);
-        log.info(time);
         List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table);
         return list;
     }
@@ -2030,7 +2034,7 @@
     }
 
     @GetMapping("weatherData")
-    @ApiOperation(value = "������city���������������������������", notes = "������city���������������������������")
+    @ApiOperation(value = "������city���������������������������������", notes = "������city���������������������������������")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
@@ -2038,6 +2042,30 @@
         Map<String, Object> parameters = getParametersStartingWith(request, null);
         List<Map<String, Object>> weatherList = weatherService.getWeatherData(parameters);
         return new ResultBean<List<Map<String, Object>>>(weatherList);
+    }
+
+    @GetMapping("weatherDataDay")
+    @ApiOperation(value = "������city���������������������", notes = "������city���������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> getWeatherDataByDay(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> weatherList = weatherService.getWeatherDataByDay(parameters);
+        return new ResultBean<List<Map<String, Object>>>(weatherList);
+    }
+
+    @GetMapping("monitorDeviceData")
+    @ApiOperation(value = "���������������5������������������������", notes = "���������������5������������������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "city", value = "���������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-15)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "������(5���������m,������������h)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "range", value = "������������������������(������������������m,���������a)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> get5MinutesOrHalfHour(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List<Map<String, Object>> deviceData = historyMinutelyService.get5MinutesOrHalfHour(parameters);
+        return new ResultBean<List<Map<String, Object>>>(deviceData);
     }
 
     @PostMapping("updateForecastWeather")
@@ -2189,4 +2217,18 @@
         return new ResultBean<List<Map<String, Object>>>(list);
     }
 
+
+
+    @GetMapping("/contrastFactor")
+    @ApiOperation(value = "������������", notes = "������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time", value = "������(���������2020-03-19���20���21)", required = true, paramType = "query", dataType = "String")})
+    public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception {
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        List list=historyHourlyService.getDataByMacAndTime(parameters);
+        //System.out.println(list);
+        return new ResultBean<List<Map<String, Object>>>(list);
+    }
 }

--
Gitblit v1.8.0