From 58fdbd07beae496c4c3b0744efe86a7d82e382b7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 22 Aug 2023 16:59:34 +0800
Subject: [PATCH] fix:部分功能优化
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 efc535c..26353e6 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
@@ -78,18 +78,19 @@
// region = RegionCodeUtils.regionCodeConvertToName(regionCode);
// }
- //���������������
+ /* //���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
- List<Integer> organizationIds = new ArrayList<>();
+
for (Organization organization : childrenOrganization) {
organizationIds.add(organization.getId());
}
- organizationIds.add(organizationId);
+ organizationIds.add(organizationId);*/
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
//������region������������������������������������������������������������������������������
//������region���������������������������������������������������������
+ List<Integer> organizationIds = deviceMapper.deviceOrgIdList(organizationId);
if (region != null){
queryMonitorPointsWrapper.eq(region, regionCode);
}
@@ -481,8 +482,6 @@
}
return resultList;
}
-
-
@Override
public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
// List<String> macs = Arrays.asList(mac.split(","));
--
Gitblit v1.8.0