From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/ScreenController.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3fde66f..dd33e5f 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -701,6 +701,9 @@
         //������������������������������������������������
         ParameterUtils.getTimeType4Time(parameters);
         String time1 = (String) parameters.get("time");
+        time1 = time1.replaceAll(" ", "");
+        parameters.put("time",time1);
+
         String mac1 = (String) parameters.get("mac");
         List<Map<String, Object>> list = null;
         if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
@@ -711,6 +714,12 @@
             parameters.put("sensors", Arrays.asList(sensorKey));
             // monitorPointService.isCompensateCalculation(parameters);
             list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+
+            /* 0���������������������11������������0���������������������1-24������������������������0������������������������������������24������������
+                ������������������24���������������23-24���������24������������������������0���������������
+             */
+            /*������������start-------------------------------------------------------------------------*/
             list.remove(0);
             if (list.size() == 23) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -722,6 +731,7 @@
                 //������������������������
                 String time2 = sdf2.format(date);
                 parameters.put("time", time2);
+                /*���������������0������������������24���������������������������*/
                 List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
                 if(!ObjectUtils.isEmpty(nextDayList)){
                     time1=time1.replaceAll(" 00:00:00"," 24");
@@ -730,6 +740,9 @@
                     list.add(datas);
                 }
             }
+            /*������������end-------------------------------------------------------------------------*/
+
+
             for (Map<String, Object> map : list) {
                 String time = map.get("time").toString();
                 time = time.substring(time.length() - 2);
@@ -1474,12 +1487,13 @@
     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 yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
         String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
-        String time = YearAndDay + " " + Hour + ":00:00";
+        String time = yearAndDay + " " + Hour + ":00:00";
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
         int month = timeLocalDateTime.getMonth().getValue();
+        parameters.put("yearAndDay",yearAndDay);
         Point dirPoint = historyHourlyService.getDirPoint(parameters);
         Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
         if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -2058,7 +2072,7 @@
         } else {
             mon = "" + month;
         }
-        String table = "history_minutely_" + year + mon;
+        String table = "history_five_minutely_" + year + mon;
         List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
         return list;
     }
@@ -2079,7 +2093,7 @@
         } else {
             mon = "" + month;
         }
-        String table = "history_minutely_" + year + mon;
+        String table = "history_five_minutely_" + year + mon;
         List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
         return list;
     }
@@ -2679,7 +2693,7 @@
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
-    public  List<List<Map>> monitorAVGData(HttpServletRequest request) throws Exception {
+    public ResultBean<List<List<Map>>> monitorAVGData(HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = getParametersStartingWith(request, null);
         String monitorPointIds = (String) parameters.get("monitorPointIds");
         String time = (String) parameters.get("time");
@@ -2704,6 +2718,6 @@
                 lists.add(dataAvbByMIdAndTime);
             }
         }
-        return lists;
+        return new ResultBean<List<List<Map>>>(lists);
     }
 }

--
Gitblit v1.8.0