From fd7ffbe87ee8e42a9a7bcdba8204541b00d25ec8 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 12 Sep 2025 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketContrastResponseService.java | 10 +++++----- .../gather/result/service/impl/ResultServiceImpl.java | 1 + .../service/impl/ContrastNonHarmonicServiceImpl.java | 8 +++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java index 3fa2f33f..3211c328 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java @@ -955,15 +955,15 @@ public class SocketContrastResponseService { Map 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 (true) { - // 最终将检测结果推送到前端 - webSend.setCode(SourceResponseCodeEnum.REAL_DATA_CHECK_FAIL.getCode());// 实时数据检测失败，最终错误推送 - WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend)); + if (result.values().stream().anyMatch(r -> r.equals(ResultEnum.NOT_QUALIFIED.getValue()))) { +// if (true) { // 判断是否启用录波 String datasourceId = FormalTestManager.currentTestPlan.getDatasourceId(); + // 最终将检测结果推送到前端 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("实时数据校验失败！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始录波》》》》》》》》》》》》》》》》"); SocketMsg socketMsg = new SocketMsg<>(); socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue()); diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 11591393..9c76bf75 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -1679,6 +1679,7 @@ public class ResultServiceImpl implements IResultService { waveDataSourceResultVO.setDataSourceName(DataSourceEnum.WAVE_DATA.getMsg() + StrUtil.SPACE + waveNum); List tempResultFlagList = resultList1.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()); waveDataSourceResultVO.setCheckResult(StorageUtil.getInteger(tempResultFlagList)); + dataSourceResultVOList.add(waveDataSourceResultVO); }); result.put(num, dataSourceResultVOList); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java index 649aa81b..0501a1be 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java @@ -47,11 +47,13 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId) .eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num) - .isNull(ObjectUtil.isNull(waveNum), ContrastNonHarmonicResult::getWaveNum) .in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList); if (isWave) { - wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum) - .eq(ObjectUtil.isNotNull(waveNum), ContrastNonHarmonicResult::getWaveNum, waveNum); + if (ObjectUtil.isNotNull(waveNum)) { + wrapper.eq(ContrastNonHarmonicResult::getWaveNum, waveNum); + } else { + wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum); + } } else { wrapper.isNull(ContrastNonHarmonicResult::getWaveNum); }