From d6428820434c9a54eb4063b74ece253924708ede Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 26 Sep 2021 09:29:30 +0800
Subject: [PATCH] screen-api 增加查询组织下所有站点id以及name接口
---
screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 2 ++
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 15 +++++++++++++++
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 18 ++++++++++++++++++
3 files changed, 35 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..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
@@ -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 ������������
diff --git a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
index 7ffe237..4d2668f 100644
--- a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
+++ b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -25,6 +25,8 @@
*/
List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form);
+ List<MonitorPoint> queryAllMonitorPoints(Integer organizationId);
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 2222d8a..0dd3448 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -77,6 +77,24 @@
return monitorPoints;
}
+ @Override
+ public List<MonitorPoint> queryAllMonitorPoints(Integer organizationId) {
+ //���������������
+ List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> organizationIds = new ArrayList<>();
+ for (Organization organization : childrenOrganization) {
+ organizationIds.add(organization.getId());
+ }
+ organizationIds.add(organizationId);
+ //������������
+ QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
+ queryMonitorPointsWrapper.select("id","name");
+ queryMonitorPointsWrapper.in("organization_id",organizationIds);
+ queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
+ return monitorPoints;
+ }
+
}
--
Gitblit v1.8.0