From 9169cc4846799cf149c92f76b8b3cb6994c80f84 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 13 Dec 2022 16:45:09 +0800
Subject: [PATCH] 测试sql
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 2540199..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
@@ -3,10 +3,8 @@
import com.moral.api.entity.MonitorPoint;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;
-import com.moral.api.pojo.vo.monitorPoint.StateControllerStationVO;
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.MonitorPointService;
-import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
@@ -63,22 +61,20 @@
}
/**
- * @Description: ���������������������
- * @Param: [regionCode]
+ * @Description: ������������������������������id������name
+ * @Param: [organizationId]
* @return: com.moral.constant.ResultMessage
* @Author: ���������
- * @Date: 2021/9/9
+ * @Date: 2021/9/26
*/
- @GetMapping("queryStateControlStation")
- public ResultMessage queryStateControlStation(Integer regionCode) {
-
- List<MonitorPoint> monitorPoints = monitorPointService.queryStateControlStationByRegionCode(regionCode);
-
- //������������������������
- StateControllerStationVO vo = StateControllerStationVO.convert(monitorPoints);
-
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+ @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 ������������
@@ -101,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