From dd39799d290a08334c543cc763806579b328264f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 Jan 2022 16:48:54 +0800
Subject: [PATCH] screen-api 增加市码转省码功能
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 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 9c85cc5..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
@@ -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
@@ -41,7 +46,11 @@
//������
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);
//���������������������������
@@ -64,16 +78,24 @@
}
@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);
+ 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