From a42dcd1d4b3aa785dfe534b2dcf36d44722e431f Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 21 Apr 2025 09:02:28 +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=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PqReportServiceImpl.java | 4 ++-- .../service/impl/ResultServiceImpl.java | 19 +++++++++---------- .../storage/service/AdHarmonicService.java | 14 ++++++++++++-- .../storage/service/AdNonHarmonicService.java | 14 ++++++++++++-- .../service/impl/AdHarmonicServiceImpl.java | 16 +++++++++++++++- .../impl/AdNonHarmonicServiceImpl.java | 17 ++++++++++++++++- 6 files changed, 66 insertions(+), 18 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index 5e660d96..f56d8c0c 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -1132,8 +1132,8 @@ public class PqReportServiceImpl extends ServiceImpl i return obj.substring(index1, obj.indexOf("#", index1)); }, Collectors.toSet()))); //key为index，value为该index下所有测试项对应的code - List adNonHarmonicResultList = adNonHarmonicService.listAll(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i); - List adHarmonicResultList = adHarmonicService.listAll(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i); + List adNonHarmonicResultList = adNonHarmonicService.listAllResultData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i); + List adHarmonicResultList = adHarmonicService.listAllResultData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i); // 填充数据 indexKeysMap.forEach((index, keys) -> { 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 5a305ad8..fb4db562 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 @@ -1014,11 +1014,11 @@ public class ResultServiceImpl implements IResultService { int timeInt = (int) timeDouble; // 填充结果数据 fillThreePhaseData(singleResult, timeInt, keyFillMap); - if(!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")){ + if (!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")) { keyFillMapList.add(keyFillMap); } }); - if(CollUtil.isNotEmpty(keyFillMapList)){ + if (CollUtil.isNotEmpty(keyFillMapList)) { // 按次数排序 PubUtils.sortByDoubleValue(keyFillMapList, ItemReportKeyEnum.TIME.getKey()); // 取出任意一次谐波数据的误差范围作为key @@ -1044,11 +1044,11 @@ public class ResultServiceImpl implements IResultService { for (AdNonHarmonicResult adNonHarmonicResult : nonHarmList) { Map keyFillMap = new HashMap<>(16); fillThreePhaseData(adNonHarmonicResult, null, keyFillMap); - if(!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")){ + if (!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")) { keyFillMapList.add(keyFillMap); } } - if(CollUtil.isNotEmpty(keyFillMapList)){ + if (CollUtil.isNotEmpty(keyFillMapList)) { // 需要对所有的填充进行按误差范围分组 Map>> errorScoperMap = keyFillMapList.stream() .collect(Collectors.groupingBy(map -> map.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()))); @@ -1073,12 +1073,12 @@ public class ResultServiceImpl implements IResultService { for (AdNonHarmonicResult adNonHarmonicResult : nonHarmList) { Map keyFillMap = new HashMap<>(8); fillTPhaseData(adNonHarmonicResult, null, keyFillMap); - if(!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")){ + if (!keyFillMap.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()).equals("/")) { keyFillMapList.add(keyFillMap); } } } - if(CollUtil.isNotEmpty(keyFillMapList)){ + if (CollUtil.isNotEmpty(keyFillMapList)) { // 需要对所有填充进行按误差范围分组 Map>> errorScoperMap = keyFillMapList.stream() .collect(Collectors.groupingBy(map -> map.get(ItemReportKeyEnum.ERROR_SCOPE.getKey()))); @@ -1518,10 +1518,10 @@ public class ResultServiceImpl implements IResultService { dataRule = DictDataEnum.AT_WILL_VALUE; } - List allNonHarmonicRawData = adNonHarmonicService.listAll(scriptId, oldCode, devId); + List allNonHarmonicRawData = adNonHarmonicService.listAllRawData(scriptId, oldCode, devId); LinkedHashMap> nonHarmonicMap = allNonHarmonicRawData.stream().sorted(Comparator.comparing(AdNonHarmonicResult::getSort)) .collect(Collectors.groupingBy(AdNonHarmonicResult::getSort, LinkedHashMap::new, Collectors.toList())); - List allHarmonicRawData = adHarmonicService.listAll(scriptId, oldCode, devId); + List allHarmonicRawData = adHarmonicService.listAllRawData(scriptId, oldCode, devId); LinkedHashMap> harmonicMap = allHarmonicRawData.stream().sorted(Comparator.comparing(AdHarmonicResult::getSort)) .collect(Collectors.groupingBy(AdHarmonicResult::getSort, LinkedHashMap::new, Collectors.toList())); @@ -1574,8 +1574,7 @@ public class ResultServiceImpl implements IResultService { for (AdNonHarmonicResult result : value) { sqlDataDTO = new DevData.SqlDataDTO(); sqlDataDTO.setType(result.getDataType()); - DictTree dictTree = dictTreeService.getById(result.getAdType()); - sqlDataDTO.setDesc(dictTree.getCode()); + sqlDataDTO.setDesc(result.getAdType()); DevData.SqlDataDTO.ListDTO listDTO = new DevData.SqlDataDTO.ListDTO(); listDTO.setA(StrUtil.isNotBlank(result.getAValue()) ? Double.valueOf(result.getAValue()) : null); listDTO.setB(StrUtil.isNotBlank(result.getBValue()) ? Double.valueOf(result.getBValue()) : null); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java index ea7381cf..d848465b 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java @@ -56,12 +56,22 @@ public interface AdHarmonicService extends IService { AdHarmonicResult getSingleResult(SingleNonHarmParam singleNonHarmParam); /** - * 获取所有谐波原始数据 + * 获取所有谐波结果数据 * * @param scriptId * @param code * @param devId 设备ID * @return */ - List listAll(String scriptId, String code, String devId); + List listAllResultData(String scriptId, String code, String devId); + + /** + * 获取所有原始数据 + * + * @param scriptId + * @param code + * @param devId + * @return + */ + List listAllRawData(String scriptId, String code, String devId); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java index 35187dec..0373aedb 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdNonHarmonicService.java @@ -48,13 +48,13 @@ public interface AdNonHarmonicService extends IService { AdNonHarmonicResult getSingleResult(SingleNonHarmParam singleNonHarmParam); /** - * 获取所有原始数据 + * 获取所有结果数据 * @param scriptId * @param code * @param devId * @return */ - List listAll(String scriptId,String code,String devId); + List listAllResultData(String scriptId,String code,String devId); /** * 根据查询条件查找结果 @@ -63,4 +63,14 @@ public interface AdNonHarmonicService extends IService { List queryByCondition(SingleNonHarmParam param); + /** + * + * 获取所有原始数据 + * + * @param scriptId + * @param code + * @param devId + * @return + */ + List listAllRawData(String scriptId, String code, String devId); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index 59e98042..39b3e940 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -247,7 +247,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl listAll(String scriptId, String code, String devId) { + public List listAllResultData(String scriptId, String code, String devId) { String prefix = "ad_harmonic_result_" + code; DynamicTableNameHandler.setTableName(prefix); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); @@ -260,6 +260,20 @@ public class AdHarmonicServiceImpl extends ServiceImpl listAllRawData(String scriptId, String code, String devId) { + String prefix = "ad_harmonic_" + code; + DynamicTableNameHandler.setTableName(prefix); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(AdHarmonicResult.class) + .selectAs(DictTree::getCode, AdHarmonicResult::getAdType) + .leftJoin(DictTree.class, DictTree::getId, AdHarmonicResult::getAdType).eq(AdHarmonicResult::getScriptId, scriptId) + .likeRight(AdHarmonicResult::getMonitorId, devId); + List results = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper); + DynamicTableNameHandler.remove(); + return results; + } + private Integer setResultFlag(List numbers) { List isData = numbers.stream().filter(Objects::nonNull) .filter(x -> ObjectUtil.isNotNull(x.getData())) diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java index 5989efa8..0bce13ab 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdNonHarmonicServiceImpl.java @@ -154,7 +154,7 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl listAll(String scriptId, String code, String devId) { + public List listAllResultData(String scriptId, String code, String devId) { String prefix = "ad_non_harmonic_result_" + code; DynamicTableNameHandler.setTableName(prefix); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); @@ -182,6 +182,21 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl listAllRawData(String scriptId, String code, String devId) { + String prefix = "ad_non_harmonic_" + code; + DynamicTableNameHandler.setTableName(prefix); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(AdNonHarmonicResult.class) + .selectAs(DictTree::getCode, AdNonHarmonicResult::getAdType) + .leftJoin(DictTree.class, DictTree::getId, AdNonHarmonicResult::getAdType) + .eq(AdNonHarmonicResult::getScriptId, scriptId) + .likeRight(AdNonHarmonicResult::getMonitorId, devId); + List results = this.getBaseMapper().selectJoinList(AdNonHarmonicResult.class, wrapper); + DynamicTableNameHandler.remove(); + return results; + } + private String unit(String code) { String unit = ""; switch (code) {