From 11d10fc9ca90ec29159738c1eac5e2d9203d8bb6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 28 Jul 2021 09:14:12 +0800
Subject: [PATCH] screen-api kafka消费者组id从配置文件获取 screen-manage 除admin角色外无法查看admin角色
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
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 1b54467..9c85cc5 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
@@ -37,7 +37,7 @@
DeviceService deviceService;
@Override
- public List<MonitorPoint> query(MonitorPointQueryForm form) {
+ public List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form) {
//������
Integer organizationId = form.getOrganizationId();
Integer regionCode = form.getRegionCode();
@@ -62,6 +62,18 @@
}
return monitorPoints;
}
+
+ @Override
+ public List<MonitorPoint> queryStateControlStationByRegionCode(Integer regionCode) {
+ //���������������������
+ Organization stateControlStationOrganization = organizationService.getStateControlStation();
+ //���������������������������������������
+ QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryWrapper.eq("organization_id",stateControlStationOrganization.getId());
+ queryWrapper.eq(RegionCodeUtils.regionCodeConvertToName(regionCode),regionCode);
+ return monitorPointMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.8.0