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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 7103577..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
@@ -97,9 +97,12 @@
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(new ArrayList<>());
+ List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ return ResultMessage.ok(response);
}
/**
@@ -127,12 +130,11 @@
*/
@PostMapping("getHourlyDataExcel")
public ResultMessage getHourlyDataExcel(@RequestBody Map<String, Object> params) {
- if (!params.containsKey("macs") || !params.containsKey("sensors") || !params.containsKey("startTime") || !params.containsKey("endTime")) {
+ 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