From 33fdfb880118291afd8474040921e91b4514d781 Mon Sep 17 00:00:00 2001
From: chenkaiyu <404897439@qq.com>
Date: Mon, 19 Jun 2023 15:10:05 +0800
Subject: [PATCH] api test

---
 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index 7b5ae9c..02a53c6 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -3,10 +3,8 @@
 import com.moral.api.entity.MonitorPoint;
 import com.moral.api.pojo.form.device.MonitorPointQueryForm;
 import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;
-import com.moral.api.pojo.vo.monitorPoint.StateControllerStationVO;
 import com.moral.api.service.HistoryFiveMinutelyService;
 import com.moral.api.service.MonitorPointService;
-import com.moral.api.service.OrganizationService;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.util.WebUtils;
@@ -19,11 +17,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -62,16 +65,21 @@
         return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
     }
 
-    @GetMapping("queryStateControlStation")
-    public ResultMessage queryStateControlStation(Integer regionCode) {
-
-        List<MonitorPoint> monitorPoints = monitorPointService.queryStateControlStationByRegionCode(regionCode);
-
-        //������������������������
-        StateControllerStationVO vo = StateControllerStationVO.convert(monitorPoints);
-
-        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+    /**
+     * @Description: ������������������������������id������name
+     * @Param: [organizationId]
+     * @return: com.moral.constant.ResultMessage
+     * @Author: ���������
+     * @Date: 2021/9/26
+     */
+    @GetMapping("queryAllMonitorPoints")
+    public ResultMessage queryAllMonitorPoints(Integer organizationId) {
+        //������������������
+        List<MonitorPoint> monitorPoints = monitorPointService.queryAllMonitorPoints(organizationId);
+        //������������
+        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), monitorPoints);
     }
+
 
     /**
      * @param request ������������
@@ -89,9 +97,44 @@
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
         String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
+        if (monitorPointIds.length >3){
+            return ResultMessage.ok();
+        }
         params.put("monitorPointIds", monitorPointIds);
         List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
         return ResultMessage.ok(response);
     }
 
+    /**
+     * @Description: ������������������������������
+     * @Param: [request]
+     * @return: com.moral.constant.ResultMessage
+     * @Author: lizijie
+     * @Date: 2022-10-10 14:00
+     **/
+    @GetMapping("getHourlyDataByMonitorPoint")
+    public ResultMessage getHourlyDataByMonitorPoint(HttpServletRequest request) {
+        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+        if (!params.containsKey("monitorPointId") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        List<Map<String, Object>> resultList = monitorPointService.getHourlyDataByMonitorPoint(params);
+        return ResultMessage.ok(resultList);
+    }
+
+    /**
+     * ������������������������
+     *
+     * @param params
+     * @return
+     */
+    @PostMapping("getHourlyDataExcel")
+    public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params) {
+        if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("times") || !params.containsKey("type")) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        List<Map<String, Object>> resList = monitorPointService.getHourlyDataDataV3(params);
+        return ResultMessage.ok(resList);
+    }
+
 }

--
Gitblit v1.8.0