From ee138e53a109cfc28aa8565575a944086711094c Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 29 Jun 2023 17:33:55 +0800
Subject: [PATCH] 去除无效内容
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 2b59ee7..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
@@ -22,8 +22,11 @@
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;
@@ -63,14 +66,14 @@
}
/**
- * @Description: ������������������������������id������name
- * @Param: [organizationId]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/9/26
- */
+ * @Description: ������������������������������id������name
+ * @Param: [organizationId]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/9/26
+ */
@GetMapping("queryAllMonitorPoints")
- public ResultMessage queryAllMonitorPoints(Integer organizationId){
+ public ResultMessage queryAllMonitorPoints(Integer organizationId) {
//������������������
List<MonitorPoint> monitorPoints = monitorPointService.queryAllMonitorPoints(organizationId);
//������������
@@ -94,17 +97,20 @@
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
+ * @Description: ������������������������������
+ * @Param: [request]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: lizijie
+ * @Date: 2022-10-10 14:00
**/
@GetMapping("getHourlyDataByMonitorPoint")
public ResultMessage getHourlyDataByMonitorPoint(HttpServletRequest request) {
@@ -118,17 +124,17 @@
/**
* ������������������������
+ *
* @param params
* @return
*/
@PostMapping("getHourlyDataExcel")
- public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params){
- if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
+ 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