From e742dd813ca48cbca806130f8419150441113e3d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 10:27:31 +0800
Subject: [PATCH] 获取用户角色修改

---
 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java |   14 +++++++++++++-
 1 files changed, 13 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 8eb74e9..ce0faaa 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,6 +3,7 @@
 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.MonitorPointService;
 import com.moral.api.service.OrganizationService;
 import com.moral.constant.ResponseCodeEnum;
@@ -41,7 +42,7 @@
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         //������������������
-        List<MonitorPoint> monitorPoints = monitorPointService.query(form);
+        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
 
         //������������������
         MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints);
@@ -49,5 +50,16 @@
         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);
+    }
+
 
 }

--
Gitblit v1.8.0