From c3c46b525762c8b4b8b19b2a5f334197c8c7284d Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 17 Sep 2025 13:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdPairServiceImpl.java | 13 +++++-- .../service/impl/DetectionServiceImpl.java | 16 ++++---- .../service/impl/ResultServiceImpl.java | 37 ++++++++----------- entrance/src/main/resources/application.yml | 4 +- .../impl/DetectionDataServiceImpl.java | 17 ++++++++- 5 files changed, 51 insertions(+), 36 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/AdPairServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/AdPairServiceImpl.java index 84d9a927..642509a6 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/AdPairServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/AdPairServiceImpl.java @@ -1,7 +1,7 @@ package com.njcn.gather.detection.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.gather.detection.mapper.AdPairMapper; import com.njcn.gather.detection.pojo.po.AdPair; @@ -9,6 +9,7 @@ import com.njcn.gather.detection.service.IAdPariService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -33,8 +34,12 @@ public class AdPairServiceImpl extends ServiceImpl impleme @Override public List listByDevIds(List devIds) { - LambdaQueryChainWrapper wrapper = this.lambdaQuery(); - devIds.forEach(devId -> wrapper.likeRight(AdPair::getDevMonitorId, devId)); - return this.list(wrapper); + if (CollUtil.isNotEmpty(devIds)) { + QueryWrapper wrapper = new QueryWrapper<>(); + devIds.forEach(devId -> wrapper.likeRight("ad_pair.Dev_Monitor_Id", devId)); + return this.list(wrapper); + } else { + return Collections.emptyList(); + } } } diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index a640d613..b79bbefd 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -1603,14 +1603,14 @@ public class DetectionServiceImpl { switch (anEnum) { case FREQ: - if (ObjectUtil.isNull(waveNum)) { - devDataList.stream().forEach(devData -> devData.getSqlData().stream().filter(sqlData -> sqlData.getDesc().equals(DetectionCodeEnum.FREQ.getCode())).findFirst().ifPresent(sqlData -> { - DevData.SqlDataDTO.ListDTO listDTO = sqlData.getList(); - listDTO.setT(55.0); - sqlData.setList(listDTO); - })); - resultMap.put(PowerIndexEnum.FREQ.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fHz, DetectionCodeEnum.FREQ.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum)); - } +// if (ObjectUtil.isNull(waveNum)) { +// devDataList.stream().forEach(devData -> devData.getSqlData().stream().filter(sqlData -> sqlData.getDesc().equals(DetectionCodeEnum.FREQ.getCode())).findFirst().ifPresent(sqlData -> { +// DevData.SqlDataDTO.ListDTO listDTO = sqlData.getList(); +// listDTO.setT(55.0); +// sqlData.setList(listDTO); +// })); +// } + resultMap.put(PowerIndexEnum.FREQ.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fHz, DetectionCodeEnum.FREQ.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum)); break; case VRMS: case PVRMS: 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 0a8d2a61..94dabbe1 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 @@ -33,7 +33,9 @@ import com.njcn.gather.detection.util.socket.FormalTestManager; import com.njcn.gather.device.pojo.enums.CommonEnum; import com.njcn.gather.device.pojo.enums.PatternEnum; import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.po.PqStandardDev; import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.device.service.IPqStandardDevService; import com.njcn.gather.err.service.IPqErrSysService; import com.njcn.gather.monitor.pojo.po.PqMonitor; import com.njcn.gather.monitor.service.IPqMonitorService; @@ -122,6 +124,7 @@ public class ResultServiceImpl implements IResultService { private final IAdPariService adPairService; private final IPqMonitorService pqMonitorService; private final IPqErrSysService pqErrSysService; + private final IPqStandardDevService standardDevService; /** * 谐波类code，取树形字典表中的code @@ -2252,9 +2255,9 @@ public class ResultServiceImpl implements IResultService { AdPair adPair = pairList1.get(0); String[] split2 = adPair.getStdDevMonitorId().split(CnSocketUtil.SPLIT_TAG); - PqDev stdDev = pqDevService.getById(split2[1]); - parsIp.put(dev.getIp() + split1[1], stdDev.getIp() + split2[1]); - parsId.put(dev.getId() + split1[1], stdDev.getId() + split2[1]); + PqStandardDev standardDev = standardDevService.getById(split2[0]); + parsIp.put(dev.getIp() + CnSocketUtil.SPLIT_TAG + split1[1], standardDev.getIp() + CnSocketUtil.SPLIT_TAG + split2[1]); + parsId.put(dev.getId() + CnSocketUtil.SPLIT_TAG + split1[1], standardDev.getId() + CnSocketUtil.SPLIT_TAG + split2[1]); numMap.put(devMonitorId, num); numMap.put(adPair.getStdDevMonitorId(), num); }); @@ -2270,11 +2273,11 @@ public class ResultServiceImpl implements IResultService { detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null); parsId.forEach((devMonitorId, stdDevMonitorId) -> { + String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG); pqMonitorService.updateMonitorResult(devMonitorId, null, DataSourceEnum.REAL_DATA, FormalTestManager.numMap.get(devMonitorId), null, oldCode); - pqDevService.updateResult(devMonitorId.split(CnSocketUtil.SPLIT_TAG)[0], null); + pqDevService.updateResult(split[0], null); }); - boolean waveFlag = true; AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId); for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) { devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null); @@ -2282,24 +2285,16 @@ public class ResultServiceImpl implements IResultService { devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null); stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null); - if (CollUtil.isNotEmpty(devNonHarmonicRawDataList) && CollUtil.isNotEmpty(stdDevNonHarmonicRawDataList) && CollUtil.isNotEmpty(devHarmonicRawDataList) && CollUtil.isNotEmpty(stdDevHarmonicRawDataList)) { - devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap); - standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap); - detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i); - } else { - waveFlag = false; - break; - } + devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap); + standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap); + detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i); } - if (waveFlag) { - parsId.forEach((devMonitorId, stdDevMonitorId) -> { - String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG); - String id = FormalTestManager.devIdMapComm.get(split[0]); - pqMonitorService.updateMonitorResult(devMonitorId, null, DataSourceEnum.WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode); - pqDevService.updateResult(id, null); - }); - } + parsId.forEach((devMonitorId, stdDevMonitorId) -> { + String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG); + pqMonitorService.updateMonitorResult(devMonitorId, null, DataSourceEnum.WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode); + pqDevService.updateResult(split[0], null); + }); }); } diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index df3f7789..bf3a2f2f 100644 --- a/entrance/src/main/resources/application.yml +++ b/entrance/src/main/resources/application.yml @@ -47,10 +47,10 @@ mybatis-plus: socket: source: - ip: 192.168.1.124 + ip: 127.0.0.1 port: 62000 device: - ip: 192.168.1.124 + ip: 127.0.0.1 port: 61000 # source: # ip: 192.168.1.121 diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java index 7b35542b..ed6b9e81 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java @@ -109,8 +109,15 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl contrastNonHarmonicResultList = BeanUtil.copyToList(nonHarmonicResultList, ContrastNonHarmonicResult.class); + List monitorIds = contrastNonHarmonicResultList.stream().map(ContrastNonHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList()); + if (CollUtil.isNotEmpty(monitorIds)) { + contrastNonHarmonicService.remove(new LambdaQueryWrapper().in(ContrastNonHarmonicResult::getDevMonitorId, monitorIds) + .eq(ContrastNonHarmonicResult::getNum, contrastNonHarmonicResultList.get(0).getNum()) + .eq(ContrastNonHarmonicResult::getDataType, contrastNonHarmonicResultList.get(0).getDataType()) + .eq(ObjectUtil.isNotNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum, contrastNonHarmonicResultList.get(0).getWaveNum()) + .isNull(ObjectUtil.isNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum)); + } contrastNonHarmonicService.saveBatch(contrastNonHarmonicResultList); - } DynamicTableNameHandler.remove(); } @@ -136,6 +143,14 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl contrastHarmonicResultList = BeanUtil.copyToList(harmonicResultList, ContrastHarmonicResult.class); + List monitorIds = contrastHarmonicResultList.stream().map(ContrastHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList()); + if (CollUtil.isNotEmpty(monitorIds)) { + contrastHarmonicService.remove(new LambdaQueryWrapper().in(ContrastHarmonicResult::getDevMonitorId, monitorIds) + .eq(ContrastHarmonicResult::getNum, contrastHarmonicResultList.get(0).getNum()) + .eq(ContrastHarmonicResult::getDataType, contrastHarmonicResultList.get(0).getDataType()) + .eq(ObjectUtil.isNotNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum, contrastHarmonicResultList.get(0).getWaveNum()) + .isNull(ObjectUtil.isNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum)); + } contrastHarmonicService.saveBatch(contrastHarmonicResultList); } DynamicTableNameHandler.remove();