From 080830b1bcf5339aac9013d279cacd2d08bbda80 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Mon, 14 Nov 2022 17:20:23 +0800
Subject: [PATCH] 剔除小时数据中时间重复的数据
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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..e8fb716 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
@@ -60,6 +60,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 ������������
@@ -82,4 +97,21 @@
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);
+ }
+
}
--
Gitblit v1.8.0