From 0e0643aed8857e9b845ee5dcc56cdec652bc89f2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 f796ba8..8c17ad1 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
@@ -107,10 +107,15 @@
if (!params.containsKey("monitorPointIds")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
+ String monitorPoint = params.remove("monitorPointIds").toString();
+ /*if(monitorPoint.contains("")){
+
+ }*/
+ String[] monitorPointIds = monitorPoint.split(",");
if (monitorPointIds.length > 3) {
return ResultMessage.ok();
}
+
params.put("monitorPointIds", monitorPointIds);
List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
return ResultMessage.ok(response);
--
Gitblit v1.8.0