From e4ebf74baef4faab3fa794c042e2921437525e6e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 10:40:52 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 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..0837c4a 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,6 +12,7 @@
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;
@@ -20,7 +21,7 @@
/**
* <p>
- * ���������������
+ * ���������������
* </p>
*
* @author moral
@@ -37,11 +38,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 +56,12 @@
organizationIds.add(organizationId);
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
- queryMonitorPointsWrapper.eq(region,regionCode);
- queryMonitorPointsWrapper.in("organization_id",organizationIds);
+
+ //������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 +71,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