From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 24 ++++++++++--------------
1 files changed, 10 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..dab4c7f 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,23 +61,21 @@
}
/**
- * @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 ������������
* @return ������������������������������������
--
Gitblit v1.8.0