diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index f73c5c44..de4f04b3 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -562,6 +562,13 @@ public class PqDevServiceImpl extends ServiceImpl implements PqDev dev = this.getById(devId); Integer checkState = pqMonitorService.getDevCheckState(devId); Integer checkResult = pqMonitorService.getDevCheckResult(devId); + if (checkResult == 1) { + checkResult = CheckResultEnum.ACCORD.getValue(); + } + if (checkResult == 2) { + checkResult = CheckResultEnum.NOT_ACCORD.getValue(); + } + SysUser user = userService.getById(userId); diff --git a/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java b/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java index dd1cd491..d673e5a1 100644 --- a/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java @@ -278,11 +278,38 @@ public class PqMonitorServiceImpl extends ServiceImpl allResultList = new ArrayList<>(); - List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList); - contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList)); - List contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList); - contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList)); + List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList); + contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList)); + List contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList); + contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList)); allResultList.addAll(contrastHarmonicResults); allResultList.addAll(contrastNonHarmonicResults); @@ -1703,27 +1703,27 @@ public class ResultServiceImpl implements IResultService { } AdPlan finalPlan = plan; // 实时数据结果 - List realNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, monitorId, null); - Map> numNonHarmonicMap = realNonHarmonicResults.stream() + List realNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null); + Map> realNumNonHarmonicMap = realNonHarmonicResults.stream() .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum)) .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); - List realHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, monitorId, null); - Map> numHarmonicMap = realHarmonicResults.stream() + List realHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null); + Map> realNumHarmonicMap = realHarmonicResults.stream() .sorted(Comparator.comparing(ContrastHarmonicResult::getNum)) .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); - Map> numResutMap = new TreeMap<>(); - numNonHarmonicMap.forEach((num, resultList) -> { - numResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); + Map> realNumResutMap = new TreeMap<>(); + realNumNonHarmonicMap.forEach((num, resultList) -> { + realNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); }); - numHarmonicMap.forEach((num, resultList) -> { - List list = numResutMap.getOrDefault(num, new ArrayList<>()); + realNumHarmonicMap.forEach((num, resultList) -> { + List list = realNumResutMap.getOrDefault(num, new ArrayList<>()); list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); - numResutMap.put(num, list); + realNumResutMap.put(num, list); }); - numResutMap.forEach((num, resultList) -> { + realNumResutMap.forEach((num, resultList) -> { List dataSourceResultVOList = new ArrayList<>(); DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO(); realDataSourceResultVO.setDataSourceCode(DataSourceEnum.REAL_DATA.getValue()); @@ -1734,14 +1734,14 @@ public class ResultServiceImpl implements IResultService { result.put(num, dataSourceResultVOList); }); - Map>> waveNumMap = new TreeMap<>(); // 录波数据结果 - List waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, monitorId, null); + Map>> waveNumMap = new TreeMap<>(); + List waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null); Map> waveNumNonHarmonicMap = waveNonHarmonicResults.stream() .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum)) .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); - List waveHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, monitorId, null); + List waveHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null); Map> waveNumHarmonicMap = waveHarmonicResults.stream() .sorted(Comparator.comparing(ContrastHarmonicResult::getNum)) .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); @@ -1783,6 +1783,61 @@ public class ResultServiceImpl implements IResultService { result.put(num, orDefault); }); + String dataRule = finalPlan.getDatasourceId(); + String[] split1 = dataRule.split(CnSocketUtil.SPLIT_TAG); + DataSourceEnum dataType = null; + for (String s : split1) { + if (MINUTE_STATISTICS_AVG.getValue().equals(s)) { + dataType = MINUTE_STATISTICS_AVG; + break; + } + if (MINUTE_STATISTICS_CP95.getValue().equals(s)) { + dataType = MINUTE_STATISTICS_CP95; + break; + } + if (MINUTE_STATISTICS_MAX.getValue().equals(s)) { + dataType = MINUTE_STATISTICS_MAX; + break; + } + if (MINUTE_STATISTICS_MIN.getValue().equals(s)) { + dataType = MINUTE_STATISTICS_MIN; + break; + } + } + + // 统计数据 + List statisticsNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null); + Map> statisticsNumNonHarmonicMap = statisticsNonHarmonicResults.stream() + .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum)) + .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); + + List statisticsHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null); + Map> statisticsNumHarmonicMap = statisticsHarmonicResults.stream() + .sorted(Comparator.comparing(ContrastHarmonicResult::getNum)) + .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); + + Map> statisticsNumResutMap = new TreeMap<>(); + statisticsNumNonHarmonicMap.forEach((num, resultList) -> { + statisticsNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); + }); + statisticsNumHarmonicMap.forEach((num, resultList) -> { + List list = statisticsNumResutMap.getOrDefault(num, new ArrayList<>()); + list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); + statisticsNumResutMap.put(num, list); + }); + + DataSourceEnum finalDataType = dataType; + statisticsNumResutMap.forEach((num, resultList) -> { + List dataSourceResultVOList = new ArrayList<>(); + DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO(); + realDataSourceResultVO.setDataSourceCode(finalDataType.getValue()); + realDataSourceResultVO.setDataSourceName(finalDataType.getMsg()); + realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList)); + dataSourceResultVOList.add(realDataSourceResultVO); + + result.put(num, dataSourceResultVOList); + }); + return result; } @@ -1834,8 +1889,8 @@ public class ResultServiceImpl implements IResultService { String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum; - List realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, monitorId, null); - List realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, monitorId, null); + List realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null); + List realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null); Map> checkItemResultMap = realNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList()))); checkItemResultMap.putAll(realHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList())))); @@ -1854,8 +1909,8 @@ public class ResultServiceImpl implements IResultService { checkItemResultMap.clear(); - List waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, monitorId, null); - List waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, monitorId, null); + List waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null); + List waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null); if (CollUtil.isNotEmpty(waveNoHarmonicResults) && CollUtil.isNotEmpty(waveHarmonicResults)) { checkItemResultMap.putAll(waveNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList())))); checkItemResultMap.putAll(waveHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList())))); @@ -2700,8 +2755,8 @@ public class ResultServiceImpl implements IResultService { private Map> getResultMap(DictTree dictTree, List adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code) { Map> resultMap = new LinkedHashMap<>(); - List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList); - List contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList); + List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList); + List contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList); if (CollUtil.isNotEmpty(contrastNonHarmonicResults)) { ContrastNonHarmonicResult contrastNonHarmonicResult = contrastNonHarmonicResults.get(0); @@ -2798,10 +2853,10 @@ public class ResultServiceImpl implements IResultService { private Map> getRawDataMap(DictTree dictTree, List adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code, List keys) { Map> rawMap = new LinkedHashMap<>(); - List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList); - List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList); - List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList); - List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList); + List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList); + List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList); + List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList); + List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); List rawDataVOList = new ArrayList<>(); @@ -3163,10 +3218,10 @@ public class ResultServiceImpl implements IResultService { devIdMapComm.put(standardDev.getIp(), standardDev.getId()); }); - List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null); - List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null); - List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null); - List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null); + List devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, deviceId, null); + List stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, deviceId, null); + List devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, deviceId, null); + List stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, deviceId, null); List devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); List standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); @@ -3183,10 +3238,10 @@ public class ResultServiceImpl implements IResultService { AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId); for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) { - devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null); - stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null); - devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null); - stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null); + devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, deviceId, null); + stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, deviceId, null); + devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, deviceId, null); + stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, deviceId, null); devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0); standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1); diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml index 88123493..ec32b3ca 100644 --- a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml +++ b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml @@ -8,10 +8,10 @@ Time_Id DATETIME(3) NOT NULL COMMENT '时间', AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表', Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表', - A_Value float DEFAULT NULL COMMENT 'A相值', - B_Value float DEFAULT NULL COMMENT 'B相值', - C_Value float DEFAULT NULL COMMENT 'C相值', - T_Value float DEFAULT NULL COMMENT 'T相值(没有相别的则存这里)', + A_Value float(14,7) DEFAULT NULL COMMENT 'A相值', + B_Value float(14,7) DEFAULT NULL COMMENT 'B相值', + C_Value float(14,7) DEFAULT NULL COMMENT 'C相值', + T_Value float(14,7) DEFAULT NULL COMMENT 'T相值(没有相别的则存这里)', Result_Flag int(1) NULL COMMENT '1合格 2不合格 4无法处理', @@ -19,9 +19,9 @@ Std_Dev_Monitor_Id CHAR(34) NOT NULL COMMENT '标准设备监测点Id', Num tinyint(1) unsigned DEFAULT 0 COMMENT '第几次检测', Flag tinyint(1) unsigned NOT NULL COMMENT '0表示被检设备数据，1表示标准设备数据', - A_Value_0 float NULL COMMENT 'A相基波有效值', - B_Value_0 float NULL COMMENT 'B相基波有效值', - C_Value_0 float NULL COMMENT 'B相基波有效值', + A_Value_0 float(14,7) NULL COMMENT 'A相基波有效值', + B_Value_0 float(14,7) NULL COMMENT 'B相基波有效值', + C_Value_0 float(14,7) NULL COMMENT 'B相基波有效值', Wave_Num tinyint(1) unsigned DEFAULT null COMMENT '录波数据第几组', PRIMARY KEY (Id) diff --git a/storage/src/main/java/com/njcn/gather/storage/service/ContrastHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/ContrastHarmonicService.java index e3926e10..72257976 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/ContrastHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/ContrastHarmonicService.java @@ -3,7 +3,6 @@ package com.njcn.gather.storage.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.gather.storage.pojo.po.ContrastHarmonicResult; -import javax.validation.constraints.NotBlank; import java.util.List; /** @@ -22,7 +21,7 @@ public interface ContrastHarmonicService extends IService listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, Integer flag, String devId, List adTypeList); + List listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, Integer flag, String devId, List adTypeList); /** * 获取所有谐波结果数据 @@ -33,27 +32,29 @@ public interface ContrastHarmonicService extends IService listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String devId, List adTypeList); + List listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, String devId, List adTypeList); /** * 获取谐波检测项的比对结果 - * @param planCode 计划code - * @param monitorId 监测点ID - * @param scriptId 指标id + * + * @param planCode 计划code + * @param monitorId 监测点ID + * @param scriptId 指标id * @param resultType 结果类型 - * @param time 第几次检测 + * @param time 第几次检测 * @return 检测结果 */ ContrastHarmonicResult getContrastResultHarm(Integer planCode, String monitorId, List scriptId, String resultType, int time); /** * 去原始表获取总次数 - * @param planCode 计划code - * @param monitorId 监测点ID - * @param scriptId 指标id + * + * @param planCode 计划code + * @param monitorId 监测点ID + * @param scriptId 指标id * @param resultType 结果类型 - * @param time 第几次检测 + * @param time 第几次检测 * @return 数据组数 */ int getNumOfData(Integer planCode, String monitorId, List scriptId, String resultType, int time); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/ContrastNonHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/ContrastNonHarmonicService.java index c1cfe0ed..302be0b5 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/ContrastNonHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/ContrastNonHarmonicService.java @@ -3,7 +3,6 @@ package com.njcn.gather.storage.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.gather.storage.pojo.po.ContrastNonHarmonicResult; -import javax.validation.constraints.NotBlank; import java.util.List; /** @@ -19,12 +18,13 @@ public interface ContrastNonHarmonicService extends IService listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, Integer flag, String devId, List adTypeList); + List listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, Integer flag, String devId, List adTypeList); /** @@ -34,31 +34,34 @@ public interface ContrastNonHarmonicService extends IService listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String devId, List adTypeList); + List listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, String devId, List adTypeList); /** * 获取非谐波检测项的比对结果 - * @param planCode 计划code - * @param monitorId 监测点ID - * @param scriptId 指标id + * + * @param planCode 计划code + * @param monitorId 监测点ID + * @param scriptId 指标id * @param resultType 结果类型 - * @param time 第几次检测 + * @param time 第几次检测 * @return 检测结果 */ ContrastNonHarmonicResult getContrastResultHarm(Integer planCode, String monitorId, List scriptId, String resultType, int time); /** * 去原始表获取总次数 - * @param planCode 计划code - * @param monitorId 监测点ID - * @param scriptId 指标id + * + * @param planCode 计划code + * @param monitorId 监测点ID + * @param scriptId 指标id * @param resultType 结果类型 - * @param time 第几次检测 + * @param time 第几次检测 * @return 数据组数 */ int getNumOfData(Integer planCode, String monitorId, List scriptId, String resultType, int time); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastHarmonicServiceImpl.java index 4a1fcca6..093a2c73 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastHarmonicServiceImpl.java @@ -3,9 +3,9 @@ package com.njcn.gather.storage.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler; import com.njcn.gather.storage.mapper.ContrastHarmonicMappper; import com.njcn.gather.storage.pojo.po.ContrastHarmonicResult; @@ -13,7 +13,6 @@ import com.njcn.gather.storage.service.ContrastHarmonicService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** @@ -26,12 +25,13 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, Integer flag, String devId, List adTypeList) { + public List listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, Integer flag, String devId, List adTypeList) { String prefix = "ad_harmonic_" + code; DynamicTableNameHandler.setTableName(prefix); LambdaQueryChainWrapper wrapper = this.lambdaQuery().likeRight(ContrastHarmonicResult::getDevMonitorId, devId) .eq(ObjectUtil.isNotNull(num), ContrastHarmonicResult::getNum, num) .eq(ContrastHarmonicResult::getFlag, flag) + .eq(StrUtil.isNotBlank(dataType), ContrastHarmonicResult::getDataType, dataType) .in(CollUtil.isNotEmpty(adTypeList), ContrastHarmonicResult::getAdType, adTypeList) .orderByAsc(ContrastHarmonicResult::getTimeId); if (isWave) { @@ -48,15 +48,14 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String devId, List adTypeList) { + public List listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, String devId, List adTypeList) { String prefix = "ad_harmonic_result_" + code; DynamicTableNameHandler.setTableName(prefix); LambdaQueryChainWrapper wrapper = this.lambdaQuery().likeRight(ContrastHarmonicResult::getDevMonitorId, devId) .eq(ObjectUtil.isNotNull(num), ContrastHarmonicResult::getNum, num) + .eq(StrUtil.isNotBlank(dataType), ContrastHarmonicResult::getDataType, dataType) .in(CollUtil.isNotEmpty(adTypeList), ContrastHarmonicResult::getAdType, adTypeList); if (isWave) { if (ObjectUtil.isNotNull(waveNum)) { @@ -73,12 +72,11 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl result = this.listAllResultData(String.valueOf(planCode), time, waveTime, isWave, monitorId, scriptId); + List result = this.listAllResultData(String.valueOf(planCode), time, waveTime, isWave, null, monitorId, scriptId); if (CollectionUtil.isNotEmpty(result)) { return result.get(0); } @@ -102,11 +100,12 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, Integer flag, String devId, List adTypeList) { + public List listAllRawData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, Integer flag, String devId, List adTypeList) { String prefix = "ad_non_harmonic_" + code; DynamicTableNameHandler.setTableName(prefix); LambdaQueryChainWrapper wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId) .eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num) .eq(ContrastNonHarmonicResult::getFlag, flag) + .eq(StrUtil.isNotBlank(dataType), ContrastNonHarmonicResult::getDataType, dataType) .in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList) .orderByAsc(ContrastNonHarmonicResult::getTimeId); if (isWave) { @@ -48,11 +49,12 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String devId, List adTypeList) { + public List listAllResultData(String code, Integer num, Integer waveNum, Boolean isWave, String dataType, String devId, List adTypeList) { String prefix = "ad_non_harmonic_result_" + code; DynamicTableNameHandler.setTableName(prefix); LambdaQueryChainWrapper wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId) .eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num) + .eq(StrUtil.isNotBlank(dataType), ContrastNonHarmonicResult::getDataType, dataType) .in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList); if (isWave) { if (ObjectUtil.isNotNull(waveNum)) { @@ -80,7 +82,7 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl result = this.listAllResultData(String.valueOf(planCode), time, waveTime, isWave, monitorId, scriptId); + List result = this.listAllResultData(String.valueOf(planCode), time, waveTime, isWave, null, monitorId, scriptId); if (CollectionUtil.isNotEmpty(result)) { return result.get(0); } @@ -106,10 +108,10 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl