luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询项目管理机构管理的最高行政区划级别下的全部行政区划的树状列表逻辑完善

Browse Source
This commit is contained in:
mi9688
2024-11-05 17:44:12 +08:00
parent 5c0027abeb
commit 899a5a833f
5 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.fastbee.ggroup.service.impl;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.fastbee.common.core.domain.entity.SysDept;
import com.fastbee.common.exception.ServiceException;
@ -61,7 +60,7 @@ public class GGroupsServiceImpl implements IGGroupsService
/**
* 查询组树状列表(不带叶子节点)
* 查询组树状列表(不带叶子节点)后台站点管理
*
* @param gGroups 组
* @return 组
@ -86,7 +85,7 @@ public class GGroupsServiceImpl implements IGGroupsService
*/
@Override
public List<GGroupSiteVo> selectGGroupsListSites(GGroups gGroups) {
//构建查询器
MPJLambdaWrapper<GSiteGroups> gSiteGroupsMPJLambdaWrapper = new MPJLambdaWrapper<GSiteGroups>()
.select(GSiteGroups::getId, GSiteGroups::getParentId, GSiteGroups::getSiteId)
// .select(GGroups::getName)//起个别名
@ -96,6 +95,7 @@ public class GGroupsServiceImpl implements IGGroupsService
.leftJoin(GGroups.class, GGroups::getId, GSiteGroups::getParentId)
.leftJoin(GSites.class, GSites::getId, GSiteGroups::getSiteId)
.eq(GSiteGroups::getParentId, gGroups.getParentId())
//按名称模糊匹配
.like(StringUtils.isNotBlank(gGroups.getSearchValue()), GSites::getName, gGroups.getSearchValue());
List<GGroupSiteVo> gGroupSiteVos = gSiteGroupsMapper.selectJoinList(GGroupSiteVo.class, gSiteGroupsMPJLambdaWrapper);
gSiteGroupsMapper.selectJoinList(GGroupSiteVo.class,gSiteGroupsMPJLambdaWrapper);
@ -114,7 +114,7 @@ public class GGroupsServiceImpl implements IGGroupsService
adcodeList.addAll(JsonUtils.parseArray(sysDept.getTownCode(), Long.class));
adcodeList.addAll(JsonUtils.parseArray(sysDept.getVillageCode(), Long.class));
//根据区域代码过滤站点
if(Objects.nonNull(adcodeList) && !adcodeList.isEmpty()){
if(!adcodeList.isEmpty()){
gGroupSiteVos = gGroupSiteVos
.stream()
.filter(gGroupSiteVo -> adcodeList.contains(Long.valueOf(gGroupSiteVo.getAreaCode()))).collect(Collectors.toList());
@ -165,11 +165,9 @@ public class GGroupsServiceImpl implements IGGroupsService
List<GGroupSiteVo> gGroupSiteAllList = selectGGroupsAllListSites(new GGroups());
//根据区域代码过滤站点
if(Objects.nonNull(areaCodeList) && !areaCodeList.isEmpty()){
gGroupSiteAllList = gGroupSiteAllList.stream()
.filter(site -> areaCodeList.contains(site.getAreaCode())).collect(Collectors.toList());
}
for (GGroups group : groupsList) {
//查询组的直接子站点列表
//过滤全部站点列表找到当前组下面的所有站点

3
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java
View File

@ -3,11 +3,8 @@ package com.fastbee.ggroup.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.DateUtils;
import com.fastbee.ggroup.domain.GSites;

2
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteDeviceServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.fastbee.ggroup.service.IGSiteDeviceService;
* 站点设备关系Service业务层处理
*
* @author kerwincui
* @date 2024-11-05
* &#064;date 2024-11-05
*/
@Service
public class GSiteDeviceServiceImpl implements IGSiteDeviceService