From 03791ab057f15d102bc20b83c687f8a8028a4b8f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 28 Dec 2021 13:47:38 +0800
Subject: [PATCH] 行业贡献率update

---
 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 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 7b5ae9c..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;
@@ -62,17 +60,22 @@
         return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
     }
 
-    @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);
+    /**
+    * @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 ������������
      * @return ������������������������������������

--
Gitblit v1.8.0