From f52e59d2cb5391b6cb46d2d75e4ffa586aa61df1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Sep 2023 11:24:42 +0800
Subject: [PATCH] chore:过滤无人机无效数据
---
screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 8a83c9b..c7c0438 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
@@ -5,6 +5,7 @@
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SysArea;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.SysAreaMapper;
import com.moral.api.service.OrganizationService;
@@ -43,13 +44,16 @@
@Autowired
private OrganizationService organizationService;
+ @Autowired
+ private DeviceMapper deviceMapper;
@Override
public List<Map<String, Object>> getMapPath(Integer orgId) {
//������������������������������
- List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
+ /*List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
- orgIds.add(orgId);
+ orgIds.add(orgId);*/
+ List<Integer> orgIds = deviceMapper.deviceOrgIdList(orgId);
QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("province_code", "city_code", "area_code")
.eq("is_delete", Constants.NOT_DELETE)
@@ -96,6 +100,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