Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改部门管理，监测点绑定，未展示监测点bug

Browse Source
This commit is contained in:
wr
2023-04-18 14:26:17 +08:00
parent 3a1f1f9795
commit c97e98fd65
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -239,8 +239,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
String areaId = areaDetail.getId(); String areaId = areaDetail.getId();
if (CollectionUtil.isNotEmpty(allList)) { if (CollectionUtil.isNotEmpty(allList)) {
List<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); List<TerminalTree> projectList;
List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); List<TerminalTree> provinceList;
if(!"0".equals(areaId)){
projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
}else{
projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList());
}
for (TerminalTree terminalTree : provinceList) { for (TerminalTree terminalTree : provinceList) {
terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); terminalTree.setName(lineMapper.getProviceName(terminalTree.getName()));
} }
@@ -314,8 +321,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
String areaId = areaDetail.getId(); String areaId = areaDetail.getId();
if (CollectionUtil.isNotEmpty(allList)) { if (CollectionUtil.isNotEmpty(allList)) {
List<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); List<TerminalTree> projectList;
List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); List<TerminalTree> provinceList;
if(!"0".equals(areaId)){
projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
}else{
projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList());
}
for (TerminalTree terminalTree : provinceList) { for (TerminalTree terminalTree : provinceList) {
terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); terminalTree.setName(lineMapper.getProviceName(terminalTree.getName()));
} }
@@ -380,8 +394,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
String areaId = areaDetail.getId(); String areaId = areaDetail.getId();
if (CollectionUtil.isNotEmpty(allList)) { if (CollectionUtil.isNotEmpty(allList)) {
List<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); List<TerminalTree> projectList;
List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); List<TerminalTree> provinceList;
if(!"0".equals(areaId)){
projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
}else{
projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList());
}
for (TerminalTree terminalTree : provinceList) { for (TerminalTree terminalTree : provinceList) {
terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); terminalTree.setName(lineMapper.getProviceName(terminalTree.getName()));
} }
@@ -454,8 +475,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
String areaId = areaDetail.getId(); String areaId = areaDetail.getId();
if (CollectionUtil.isNotEmpty(allList)) { if (CollectionUtil.isNotEmpty(allList)) {
List<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); List<TerminalTree> projectList;
List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); List<TerminalTree> provinceList;
if(!"0".equals(areaId)){
projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
}else{
projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList());
provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList());
}
for (TerminalTree terminalTree : provinceList) { for (TerminalTree terminalTree : provinceList) {
terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); terminalTree.setName(lineMapper.getProviceName(terminalTree.getName()));
} }

3
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java
View File

@@ -208,6 +208,9 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
areaQueryWrapper.eq("sys_area.type", type); areaQueryWrapper.eq("sys_area.type", type);
areaQueryWrapper.eq("sys_area.state", DataStateEnum.ENABLE.getCode()); areaQueryWrapper.eq("sys_area.state", DataStateEnum.ENABLE.getCode());
Area area = this.baseMapper.selectOne(areaQueryWrapper); Area area = this.baseMapper.selectOne(areaQueryWrapper);
if (area.getPid().equals("-1")) {
return area;
}
if (!area.getPid().equals("0")) { if (!area.getPid().equals("0")) {
id = area.getPid(); id = area.getPid();
area = areaPro(id, type); area = areaPro(id, type);