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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhumeixiao
2024-11-04 09:57:56 +08:00
parent 76cf0fa32e 915d630a44
commit c1a8e34152
13 changed files with 324 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,14 +135,9 @@ public class GGroupsServiceImpl implements IGGroupsService
List<GGroupSiteVo> gGroupSiteAllList = selectGGroupsAllListSites(new GGroups());
//根据区域代码过滤站点
if(Objects.nonNull(areaCodeList) && !areaCodeList.isEmpty()){
System.err.println("开始过滤站点");
System.err.println(areaCodeList);
System.err.println("过滤前站点");
System.err.println(gGroupSiteAllList);
gGroupSiteAllList = gGroupSiteAllList.stream()
.filter(site -> areaCodeList.contains(site.getAreaCode())).collect(Collectors.toList());
System.err.println("过滤后的站点");
System.err.println(gGroupSiteAllList);
}
for (GGroups group : groupsList) {
@ -250,14 +245,17 @@ public class GGroupsServiceImpl implements IGGroupsService
*/
@Override
public List<?> selectGGroupsAndSitesList(GGroups gGroups) {
//超级管理员不显示
if(ProjectHolder.getProjectInfo().getProjectIdList().isEmpty()){
return new ArrayList<>();
}
//查询项目下的全部站点
List<GGroups> groupSiteTreeList = new LambdaQueryChainWrapper<>(gGroupsMapper)
.select(GGroups::getId, GGroups::getName, GGroups::getParentId, GGroups::getIcon,GGroups::getTag,
GGroups::getSpace, GGroups::getSpaceValue, GGroups::getProjectId)
//根据站点标签过滤
.eq(Objects.nonNull(gGroups.getTag()), GGroups::getTag, gGroups.getTag())
.in(!ProjectHolder.getProjectInfo().getProjectIdList().isEmpty(),GGroups::getProjectId,
ProjectHolder.getProjectInfo().getProjectIdList())
.in(GGroups::getProjectId, ProjectHolder.getProjectInfo().getProjectIdList())
.list();
//构建组和站点树状列表