From da0abda12d95d701f8873db506136898e66fef8e Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 02 Dec 2020 11:10:33 +0800
Subject: [PATCH] aqi首要污染物算法更新

---
 src/main/java/com/moral/controller/WebController.java |   66 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 6924c97..f92d917 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -205,8 +205,9 @@
      * @Date: 2020/10/19
      */
 
-    @GetMapping("fiveMinuteAvgData")
-    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
+    @UserLoginToken
+    @GetMapping("fiveMinuteAvgDataNew")
+    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) {
         //���������������������������regionCode
         Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
         if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("regionCode")))
@@ -255,6 +256,64 @@
         //������monitorPointId���������������������
         List<Map<String, Object>> coordinate = new ArrayList<>();
         Integer orgId = account.getOrganizationId();
+        monitorPoints.forEach(value -> {
+            if ("���������".equals(value.getDescription())) {
+                List list = LatLngTransformation.Convert_BD09_To_GCJ02(value.getLatitude(), value.getLongitude());
+                Map<String, Object> controlStation = new HashMap<>();
+                controlStation.put("name", value.getName());
+                controlStation.put("longitude", list.get(0));
+                controlStation.put("latitude", list.get(1));
+                coordinate.add(controlStation);
+            }
+        });
+
+        Map<String, Object> datasMap = new HashMap<>();
+        datasMap.put("coordinate", coordinate);
+        datasMap.put("device", datas);
+
+        return new ResultBean<Map<String, Object>>(datasMap);
+    }
+
+    @GetMapping("fiveMinuteAvgData")
+    public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
+        //���������������������������monitorpointId
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("monitorPointId")))
+            return ResultBean.fail("���������null");
+        String sensorKey = (String) parameters.get("sensorKey");
+        Integer monitorPointId = Integer.parseInt((String) parameters.get("monitorPointId"));
+
+        //������monitorpointId������������������������������mac������
+        List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+        if (ObjectUtils.isEmpty(devices))
+            return ResultBean.fail("���������������������monitorPointId������");
+        List<String> macs = new ArrayList<>();
+        devices.forEach(p -> {
+            macs.add(p.getMac());
+        });
+
+        //���������������mac���������������������������������������������������������
+        Map<String, Object> timeAndYearMonth = getTimeAndYearMonthForFiveMinuteData();
+        String time = (String) timeAndYearMonth.get("time");
+        String yearAndMonth = (String) timeAndYearMonth.get("yearAndMonth");
+        parameters.put("time", time);
+        parameters.put("yearAndMonth", yearAndMonth);
+        parameters.put("macs", macs);
+        List<Map<String, Object>> datas = historyFiveMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+
+        //������������������������������������������������������������������������������
+        if (ObjectUtils.isEmpty(datas)) {
+            time = getFiveMinuteAgoTime(time);
+            parameters.put("time", time);
+            datas = historyFiveMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+        }
+        datas = insertDeviceInfo(datas, devices);
+
+        //������monitorPointId���������������������
+        List<Map<String, Object>> coordinate = new ArrayList<>();
+        MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
+        Integer orgId = monitorPoint.getOrganizationId();
+        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
         monitorPoints.forEach(value -> {
             if ("���������".equals(value.getDescription())) {
                 List list = LatLngTransformation.Convert_BD09_To_GCJ02(value.getLatitude(), value.getLongitude());
@@ -443,14 +502,13 @@
         List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(paramMap);
         if (ObjectUtils.isEmpty(monitorPoints))
             return new ResultBean<>("���������������������������", ResultBean.FAIL);
-        return new ResultBean<>(monitorPoints);
+        return new ResultBean<List<MonitorPoint>>(monitorPoints);
     }
 
 
     /**
      * @Description: ���������������������������������������state
      * @Param: [datas, devices]
-     * @return: java.util.List<java.util.Map                               <                               java.lang.String                               ,                               java.lang.Object>>
      * @Author: ������������
      * @Date: 2020/10/19
      */

--
Gitblit v1.8.0