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

微调

Browse Source
This commit is contained in:
caozehui
2025-10-30 14:49:22 +08:00
parent 321ec97130
commit af4f000b13
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java
View File

@@ -197,7 +197,18 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
if (CheckResultEnum.ACCORD.getValue().equals(oldMonitorResult)) { if (CheckResultEnum.ACCORD.getValue().equals(oldMonitorResult)) {
if (CheckResultEnum.ACCORD.getValue().equals(newMonitorResult)) { if (CheckResultEnum.ACCORD.getValue().equals(newMonitorResult)) {
String oldNum = "";
if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
oldNum = monitor.getRealtimeNum();
} else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
oldNum = monitor.getRecordedNum();
} else {
oldNum = monitor.getStatisticsNum();
}
String[] split1 = oldNum.split(CnSocketUtil.SPLIT_TAG);
if (!split1[0].equals(num.toString())) {
qualifiedNum += 1; qualifiedNum += 1;
}
updateFlag = true; updateFlag = true;
} }
} else { } else {
@@ -285,7 +296,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
if (monitor.getRealtimeResult() == 1) { if (monitor.getRealtimeResult() == 1) {
allResultFlags.add(1); allResultFlags.add(1);
} }
if(monitor.getRealtimeResult() == 4){ if (monitor.getRealtimeResult() == 4) {
allResultFlags.add(4); allResultFlags.add(4);
} }
} else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) { } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
@@ -296,7 +307,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
if (monitor.getRecordedResult() == 1) { if (monitor.getRecordedResult() == 1) {
allResultFlags.add(1); allResultFlags.add(1);
} }
if(monitor.getRecordedResult() == 4){ if (monitor.getRecordedResult() == 4) {
allResultFlags.add(4); allResultFlags.add(4);
} }
} else { } else {
@@ -307,7 +318,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
if (monitor.getStatisticsResult() == 1) { if (monitor.getStatisticsResult() == 1) {
allResultFlags.add(1); allResultFlags.add(1);
} }
if(monitor.getStatisticsResult() == 4){ if (monitor.getStatisticsResult() == 4) {
allResultFlags.add(4); allResultFlags.add(4);
} }
} }

5
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -1878,8 +1878,11 @@ public class ResultServiceImpl implements IResultService {
monitor.setRecordedResult(null); monitor.setRecordedResult(null);
monitor.setRecordedNum(null); monitor.setRecordedNum(null);
} }
boolean flag = pqMonitorService.updateById(monitor);
return pqMonitorService.updateById(monitor); pqDevService.updateResult(split[0], null);
return flag;
} }
@Override @Override