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-10-28 18:01:46 +08:00
parent 3b51726b58
commit 5b2ea1f01b
14 changed files with 152 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
View File

@ -198,7 +198,8 @@ public class ProjectServiceImpl implements IProjectService
//查询该管理员所管理的项目id以及子项目id列表
Project project = new LambdaQueryChainWrapper<>(projectMapper)
.select(Project::getId, Project::getProjectName,Project::getLevel,Project::getDeptId)
.select(Project::getId, Project::getProjectName,Project::getLevel,Project::getDeptId
,Project::getCityCode,Project::getCountyCode)
.eq(Project::getDeptId, sysUser.getDeptId())
.one();
if(Objects.isNull(project)){
@ -211,7 +212,16 @@ public class ProjectServiceImpl implements IProjectService
map.put("projectIds",projectsBase64);
map.put("projectId",project.getId());
map.put("projectName", project.getProjectName());
map.put("projectLevel",project.getLevel().equals("市级")? ProjectLevelConstant.LEVEL_CITY :ProjectLevelConstant.LEVEL_COUNTY);
if(project.getLevel().equals("市级")){
map.put("projectLevel", ProjectLevelConstant.LEVEL_CITY);
map.put("projectAreaCode", JSONUtil.parseArray(project.getCityCode()).get(0));
}
if(project.getLevel().equals("县级")){
map.put("projectLevel", ProjectLevelConstant.LEVEL_COUNTY);
map.put("projectAreaCode",JSONUtil.parseArray(project.getCountyCode()).get(0));
}
return map;
}
@ -298,8 +308,8 @@ public class ProjectServiceImpl implements IProjectService
.in(SysDistrict::getAdcode,administrativeCodeList)
.list();
System.err.println("项目所属县下面的所有镇、村行政区划列表");
System.err.println(projectDistrictList);
// System.err.println("项目所属县下面的所有镇、村行政区划列表");
// System.err.println(projectDistrictList);
//构建树状结构
return buildTree(projectDistrictList);
}
@ -343,10 +353,10 @@ public class ProjectServiceImpl implements IProjectService
distinctTownCodeList = townCodeList.stream().distinct().collect(Collectors.toList());
JSONArray villageCodeList = JSONUtil.parseArray(project.getVillageCode());
System.err.println("镇行政区划代码");
System.err.println(distinctTownCodeList);
System.err.println("村行政区划代码");
System.err.println(villageCodeList);
// System.err.println("镇行政区划代码");
// System.err.println(distinctTownCodeList);
// System.err.println("村行政区划代码");
// System.err.println(villageCodeList);
//合并省、市、县、镇、村行政区划代码集合
List<Object> administrativeCodeList = new ArrayList<>();
int[] startLevels = {1, 2, 3, 4, 5};
@ -360,8 +370,8 @@ public class ProjectServiceImpl implements IProjectService
break;
}
}
System.err.println("合并后镇、村行政区划代码");
System.err.println(administrativeCodeList);
// System.err.println("合并后镇、村行政区划代码");
// System.err.println(administrativeCodeList);
return administrativeCodeList;
}