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 a25115d0..287dd875 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 @@ -1031,8 +1031,8 @@ public class SocketContrastResponseService { // 原始数据入库 List devDataList = FormalTestManager.devDataMap.values().stream().flatMap(List::stream).collect(Collectors.toList()); List standardDevDataList = FormalTestManager.standardDevDataMap.values().stream().flatMap(List::stream).collect(Collectors.toList()); - baseDataInsert(false, null, devDataList, FormalTestManager.numMap, code); - baseDataInsert(true, null, standardDevDataList, FormalTestManager.numMap, code); + baseDataInsert(false, null, DataSourceEnum.REAL_DATA, devDataList, FormalTestManager.numMap, code); + baseDataInsert(true, null, DataSourceEnum.REAL_DATA, standardDevDataList, FormalTestManager.numMap, code); // 进行误差计算 List allResultList = detectionService.processing( @@ -1217,8 +1217,8 @@ public class SocketContrastResponseService { List standardDevDataList = FormalTestManager.standardDevDataMap.values().stream().flatMap(List::stream).collect(Collectors.toList()); // 原始数据入库 - baseDataInsert(false, FormalTestManager.waveNum, devDataList, FormalTestManager.numMap, code); - baseDataInsert(true, FormalTestManager.waveNum, standardDevDataList, FormalTestManager.numMap, code); + baseDataInsert(false, FormalTestManager.waveNum, DataSourceEnum.WAVE_DATA, devDataList, FormalTestManager.numMap, code); + baseDataInsert(true, FormalTestManager.waveNum, DataSourceEnum.WAVE_DATA, standardDevDataList, FormalTestManager.numMap, code); // 进行误差计算 List allResultList = detectionService.processing( @@ -2089,11 +2089,12 @@ public class SocketContrastResponseService { * * @param isStdDev 是否为标准设备 * @param waveNum 第几次录波 + * @param dataType 数据类型 * @param devDataList 原始数据 * @param numMap 第几次监测 key为被检设备监测点id,value为第几次监测 * @param code 表后缀code */ - private void baseDataInsert(boolean isStdDev, Integer waveNum, List devDataList, Map numMap, String code) { + private void baseDataInsert(boolean isStdDev, Integer waveNum, DataSourceEnum dataType, List devDataList, Map numMap, String code) { System.out.println("原始数据插入数据库开始执行========================================="); List contrastNonHarmonicResults = new ArrayList<>(); List contrastHarmonicResults = new ArrayList<>(); @@ -2139,7 +2140,7 @@ public class SocketContrastResponseService { adNonHarmonicResult.setTimeId(localDateTime); adNonHarmonicResult.setNum(numMap.get(temId)); adNonHarmonicResult.setAdType(FormalTestManager.testItemMap.get(DetectionCodeEnum.REAL_PREFIX.getCode() + sqlDataDTO.getDesc())); - adNonHarmonicResult.setDataType(DataSourceEnum.REAL_DATA.getValue()); + adNonHarmonicResult.setDataType(dataType.getValue()); if (isStdDev) { adNonHarmonicResult.setDevMonitorId(FormalTestManager.pairsIdMap.inverse().get(temId)); adNonHarmonicResult.setStdDevMonitorId(temId); @@ -2187,7 +2188,7 @@ public class SocketContrastResponseService { adHarmonicResult.setTimeId(localDateTime); adHarmonicResult.setNum(numMap.get(temId)); adHarmonicResult.setAdType(FormalTestManager.testItemMap.get(DetectionCodeEnum.REAL_PREFIX.getCode() + sqlDataDTO.getDesc())); - adHarmonicResult.setDataType(DataSourceEnum.REAL_DATA.getValue()); + adHarmonicResult.setDataType(dataType.getValue()); if (isStdDev) { adHarmonicResult.setDevMonitorId(FormalTestManager.pairsIdMap.inverse().get(temId)); adHarmonicResult.setStdDevMonitorId(temId); diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/AlignDataExcel.java b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/AlignDataExcel.java index a6321455..c2f5d48a 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/AlignDataExcel.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/AlignDataExcel.java @@ -10,29 +10,32 @@ import lombok.Data; @Data public class AlignDataExcel { - @Excel(name = "时间", orderNum = "1", width = 40, groupName = "被检设备") + + @Excel(name = "时间", orderNum = "1", width = 40, groupName = "标准设备") + private String timeStdDev; + + @Excel(name = "Ua", orderNum = "2", groupName = "标准设备") + private Double uaStdDev; + + @Excel(name = "Ub", orderNum = "3", groupName = "标准设备") + private Double ubStdDev; + + @Excel(name = "Uc", orderNum = "4", groupName = "标准设备") + private Double ucStdDev; + + @Excel(name = "时间", orderNum = "5", width = 40, groupName = "被检设备") private String timeDev; - @Excel(name = "Ua", orderNum = "2", groupName = "被检设备") + @Excel(name = "Ua", orderNum = "6", groupName = "被检设备") private Double uaDev; - @Excel(name = "Ub", orderNum = "3", groupName = "被检设备") + @Excel(name = "Ub", orderNum = "7", groupName = "被检设备") private Double ubDev; - @Excel(name = "Uc", orderNum = "4", groupName = "被检设备") + @Excel(name = "Uc", orderNum = "8", groupName = "被检设备") private Double ucDev; - @Excel(name = "时间", orderNum = "5", width = 40, groupName = "标准设备") - private String timeStdDev; - @Excel(name = "Ua", orderNum = "6", groupName = "标准设备") - private Double uaStdDev; - - @Excel(name = "Ub", orderNum = "7", groupName = "标准设备") - private Double ubStdDev; - - @Excel(name = "Uc", orderNum = "8", groupName = "标准设备") - private Double ucStdDev; } 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 84f834e3..16aea260 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,13 +1603,13 @@ 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); - })); - } +// 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: @@ -1618,7 +1618,7 @@ public class DetectionServiceImpl { resultMap.put(PowerIndexEnum.V.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fUn, (isDelta && isExitDelta ? DetectionCodeEnum.PVRMS.getCode() : DetectionCodeEnum.VRMS.getCode()), dataRule, num, code, oneConfig.getScale(), waveNum)); break; case IRMS: -// if (ObjectUtil.isNotNull(waveNum)) { +// if (ObjectUtil.isNotNull(waveNum) && (waveNum.equals(2) || waveNum.equals(5))) { // devDataList.stream().forEach(devData -> devData.getSqlData().stream().filter(sqlData -> sqlData.getDesc().equals(DetectionCodeEnum.IRMS.getCode())).findFirst().ifPresent(sqlData -> { // DevData.SqlDataDTO.ListDTO listDTO = sqlData.getList(); // listDTO.setA(1.5);