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-09-12 15:11:09 +08:00
parent 12edb57581
commit fd7ffbe87e
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
View File

@@ -955,15 +955,15 @@ public class SocketContrastResponseService {
Map<String, Integer> result = detectionDataDealService.devResult(true, FormalTestManager.pairsIdMap.keySet().stream().collect(Collectors.toList()), adTypes, code); Map<String, Integer> result = detectionDataDealService.devResult(true, FormalTestManager.pairsIdMap.keySet().stream().collect(Collectors.toList()), adTypes, code);
// 若有不符合的 // 若有不符合的
// if (result.values().stream().anyMatch(r -> r.equals(ResultEnum.NOT_QUALIFIED.getValue()))) { if (result.values().stream().anyMatch(r -> r.equals(ResultEnum.NOT_QUALIFIED.getValue()))) {
if (true) { // if (true) {
// 最终将检测结果推送到前端
webSend.setCode(SourceResponseCodeEnum.REAL_DATA_CHECK_FAIL.getCode());// 实时数据检测失败，最终错误推送
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
// 判断是否启用录波 // 判断是否启用录波
String datasourceId = FormalTestManager.currentTestPlan.getDatasourceId(); String datasourceId = FormalTestManager.currentTestPlan.getDatasourceId();
// 最终将检测结果推送到前端
if (datasourceId.contains(DataSourceEnum.WAVE_DATA.getValue())) { if (datasourceId.contains(DataSourceEnum.WAVE_DATA.getValue())) {
webSend.setCode(SourceResponseCodeEnum.REAL_DATA_CHECK_FAIL.getCode());// 实时数据检测失败，最终错误推送
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
System.out.println("实时数据校验失败！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始录波》》》》》》》》》》》》》》》》"); System.out.println("实时数据校验失败！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始录波》》》》》》》》》》》》》》》》");
SocketMsg<String> socketMsg = new SocketMsg<>(); SocketMsg<String> socketMsg = new SocketMsg<>();
socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue()); socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());

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

@@ -1679,6 +1679,7 @@ public class ResultServiceImpl implements IResultService {
waveDataSourceResultVO.setDataSourceName(DataSourceEnum.WAVE_DATA.getMsg() + StrUtil.SPACE + waveNum); waveDataSourceResultVO.setDataSourceName(DataSourceEnum.WAVE_DATA.getMsg() + StrUtil.SPACE + waveNum);
List<Integer> tempResultFlagList = resultList1.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()); List<Integer> tempResultFlagList = resultList1.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList());
waveDataSourceResultVO.setCheckResult(StorageUtil.getInteger(tempResultFlagList)); waveDataSourceResultVO.setCheckResult(StorageUtil.getInteger(tempResultFlagList));
dataSourceResultVOList.add(waveDataSourceResultVO);
}); });
result.put(num, dataSourceResultVOList); result.put(num, dataSourceResultVOList);

8
storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java
View File

@@ -47,11 +47,13 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl<ContrastNonHarmo
DynamicTableNameHandler.setTableName(prefix); DynamicTableNameHandler.setTableName(prefix);
LambdaQueryChainWrapper<ContrastNonHarmonicResult> wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId) LambdaQueryChainWrapper<ContrastNonHarmonicResult> wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId)
.eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num) .eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num)
.isNull(ObjectUtil.isNull(waveNum), ContrastNonHarmonicResult::getWaveNum)
.in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList); .in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList);
if (isWave) { if (isWave) {
wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum) if (ObjectUtil.isNotNull(waveNum)) {
.eq(ObjectUtil.isNotNull(waveNum), ContrastNonHarmonicResult::getWaveNum, waveNum); wrapper.eq(ContrastNonHarmonicResult::getWaveNum, waveNum);
} else {
wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum);
}
} else { } else {
wrapper.isNull(ContrastNonHarmonicResult::getWaveNum); wrapper.isNull(ContrastNonHarmonicResult::getWaveNum);
} }