ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2025-01-22 11:41:09 +08:00
parent 8a2ef975ea
commit ab3d90fd24
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java
View File

@@ -22,7 +22,7 @@ public enum DevResponseEnum {
DEV_UN_CHECKED("A001013","装置还未检测完成！" ), DEV_UN_CHECKED("A001013","装置还未检测完成！" ),
DEV_UN_REPORT("A001013","装置报告未生成！" ), DEV_UN_REPORT("A001013","装置报告未生成！" ),
DEVICE_DIS_ERROR("A001014","装置配置异常" ), DEVICE_DIS_ERROR("A001014","装置配置异常" ),
DEVICE_DELETE("A001015","设备无法删除，已绑定计划！ " ) DEVICE_DELETE("A001015","设备无法删除，已绑定计划！" )
; ;

13
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -161,6 +161,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
StringBuffer str; StringBuffer str;
if (CollUtil.isNotEmpty(collect)) { if (CollUtil.isNotEmpty(collect)) {
str = new StringBuffer(); str = new StringBuffer();
str.append("&&");
collect.forEach((k, v) -> { collect.forEach((k, v) -> {
str.append(k + ": "); str.append(k + ": ");
for (int i = 0; i < v.size(); i++) { for (int i = 0; i < v.size(); i++) {
@@ -326,16 +327,20 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
List<Integer> notUnchecked = list.stream().map(PqDev::getCheckState).filter(x -> !x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList()); List<Integer> notUnchecked = list.stream().map(PqDev::getCheckState).filter(x -> !x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList());
if (CollUtil.isNotEmpty(notUnchecked)) { if (CollUtil.isNotEmpty(notUnchecked)) {
List<Integer> unchecked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList()); List<Integer> unchecked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList());
//计划未检测
if (CollUtil.isNotEmpty(unchecked)) { if (CollUtil.isNotEmpty(unchecked)) {
return CheckStateEnum.CHECKING.getValue(); return CheckStateEnum.CHECKING.getValue();
} }
List<Integer> checking = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.CHECKING.getValue())).distinct().collect(Collectors.toList()); //计划检测中
List<String> checking = list.stream().filter(x -> CheckStateEnum.CHECKING.getValue().equals(x.getCheckState()) ||
CheckStateEnum.CHECKED.getValue().equals(x.getCheckState()) ||
!DevDocumentStateEnum.DOCUMENTED.getValue().equals(x.getReportState())
).map(PqDev::getId).distinct().collect(Collectors.toList());
if (checking.size() == notUnchecked.size()) { if (checking.size() == notUnchecked.size()) {
return CheckStateEnum.CHECKING.getValue(); return CheckStateEnum.CHECKING.getValue();
} }
List<Integer> checked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.CHECKED.getValue()) || //检测完成
x.equals(CheckStateEnum.DOCUMENTED.getValue()) List<Integer> checked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.DOCUMENTED.getValue())).distinct().collect(Collectors.toList());
).distinct().collect(Collectors.toList());
if (checked.size() == notUnchecked.size()) { if (checked.size() == notUnchecked.size()) {
return CheckStateEnum.CHECKED.getValue(); return CheckStateEnum.CHECKED.getValue();
} }