From d897abf4a86c0f3c6e3b80b2eef1324a06a9132e Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 11:08:17 +0800
Subject: [PATCH] test
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 e8fb716..1723823 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
@@ -17,9 +17,12 @@
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.List;
import java.util.Map;
@@ -93,8 +96,8 @@
}
String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
params.put("monitorPointIds", monitorPointIds);
- List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
- return ResultMessage.ok(response);
+ //List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
+ return ResultMessage.ok(new ArrayList<>());
}
/**
@@ -114,4 +117,19 @@
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("startTime") || !params.containsKey("endTime")) {
+ 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