From 48cde94624bec615f9df9a481339d5b71be311e5 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 17:39:23 +0800
Subject: [PATCH] test
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 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 7e2bd66..2890f46 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,11 +17,15 @@
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.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -60,6 +64,21 @@
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 ������������
@@ -77,9 +96,43 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
- params.put("monitorPointIds", monitorPointIds);
+ List<String> collect = Arrays.stream(monitorPointIds).filter(o -> !o.equals("60")).collect(Collectors.toList());
+ params.put("monitorPointIds", collect);
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("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