From a4bcc1576c21046167cdea4049821e2238757784 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sat, 18 Sep 2021 09:45:59 +0800
Subject: [PATCH] screen-manage 修改添加父菜单BUG
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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 1b54467..8de6dc0 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
@@ -12,15 +12,20 @@
import com.moral.api.service.OrganizationService;
import com.moral.constant.Constants;
import com.moral.util.RegionCodeUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
- * ���������������
+ * ���������������
* </p>
*
* @author moral
@@ -37,11 +42,15 @@
DeviceService deviceService;
@Override
- public List<MonitorPoint> query(MonitorPointQueryForm form) {
+ public List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form) {
//������
Integer organizationId = form.getOrganizationId();
Integer regionCode = form.getRegionCode();
- String region = RegionCodeUtils.regionCodeConvertToName(regionCode);
+ String region = null;
+ if (regionCode != null) {
+ region = RegionCodeUtils.regionCodeConvertToName(regionCode);
+ }
+
//���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
List<Integer> organizationIds = new ArrayList<>();
@@ -51,8 +60,13 @@
organizationIds.add(organizationId);
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
- queryMonitorPointsWrapper.eq(region,regionCode);
- queryMonitorPointsWrapper.in("organization_id",organizationIds);
+
+ //������region������������������������������������������������������������������������������
+ //������region���������������������������������������������������������
+ if (region != null){
+ queryMonitorPointsWrapper.eq(region, regionCode);
+ }
+ queryMonitorPointsWrapper.in("organization_id", organizationIds);
queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
//���������������������������
@@ -62,6 +76,19 @@
}
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