From 042ec2ba273ebbffdd3891e5c708a4b6decaf82e Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 15:13:28 +0800
Subject: [PATCH] test
---
screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
index f7636df..d5b32bc 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Menu;
import com.moral.api.entity.MonitorPoint;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.SysArea;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.SysAreaMapper;
+import com.moral.api.service.OrganizationService;
import com.moral.api.service.SysAreaService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -39,12 +41,20 @@
@Autowired
private MonitorPointMapper monitorPointMapper;
+ @Autowired
+ private OrganizationService organizationService;
+
@Override
public List<Map<String, Object>> getMapPath(Integer orgId) {
+ //������������������������������
+ List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("province_code", "city_code", "area_code")
- .eq("organization_id", orgId)
- .eq("is_delete", Constants.NOT_DELETE);
+ .eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", orgIds);
+
//������������id������������������
List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryWrapper);
Set<Integer> cityCodes = new HashSet<>();
@@ -86,6 +96,20 @@
return newList;
}
+ @Override
+ public List<SysArea> getChildren(Integer regionCode) {
+ QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
+ wrapper.eq("parent_code",regionCode);
+ return sysAreaMapper.selectList(wrapper);
+ }
+
+ @Override
+ public SysArea getAreaByCode(Integer regionCode) {
+ QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_code",regionCode);
+ return sysAreaMapper.selectOne(wrapper);
+ }
+
//������������������������
private List<Map<String, Object>> getAreasByRecursion(SysArea sysArea, List<SysArea> sysAreas) {
SysArea newSysArea = new SysArea();
--
Gitblit v1.8.0