diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index 83da2f29..9cfc47a3 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -780,7 +780,7 @@ public class SocketDevResponseService { if (param.getOperateType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) { //不合格项复检 StorageParam storageParam = new StorageParam(); - storageParam.setCode(Integer.valueOf(param.getCode())); + storageParam.setCode(param.getCode()); storageParam.setScriptId(param.getScriptId()); List indexes = adHarmonicService.getIndex(storageParam, true); issueParam.setIndexList(indexes); diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index eb5acdf5..4f45494c 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -100,10 +100,10 @@ public class SocketSourceResponseService { if (ObjectUtil.isNotNull(dictDataEnumByCode)) { switch (dictDataEnumByCode) { case SUCCESS: - if(param.getSendWebMsg()){ + if (param.getSendWebMsg()) { WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); } - System.out.println("模拟检测-源初始化成功"); + System.out.println(param.getSendWebMsg() + "模拟检测-源初始化成功"); break; case UNPROCESSED_BUSINESS: WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); @@ -159,7 +159,7 @@ public class SocketSourceResponseService { switch (dictDataEnumByCode) { case SUCCESS: WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); - System.out.println("模拟检测-源成功执行脚本"+JSON.toJSONString(socketDataMsg)); + System.out.println("模拟检测-源成功执行脚本" + JSON.toJSONString(socketDataMsg)); break; case UNPROCESSED_BUSINESS: WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg)); 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 74cb1951..6ab05e61 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 @@ -950,10 +950,10 @@ public class DetectionServiceImpl { .sorted().distinct().collect(Collectors.toList())); } for (DevData devData : dev) { - List sqlDataDTOList = devData.getSqlData(); + List sqlDataDTOS = devData.getSqlData(); Optional first = Optional.empty(); - if (CollUtil.isNotEmpty(sqlDataDTOList)) { - first = sqlDataDTOList.stream().filter(x -> x.getDesc().equals(fundCode)).collect(Collectors.toList()).stream().findFirst(); + if (CollUtil.isNotEmpty(sqlDataDTOS)) { + first = sqlDataDTOS.stream().filter(x -> x.getDesc().equals(fundCode)).collect(Collectors.toList()).stream().findFirst(); } DevData.SqlDataDTO fund = null; if (first.isPresent()) { diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/MsgUtil.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/MsgUtil.java index 08c5f5eb..3d61296f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/MsgUtil.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/MsgUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum; import com.njcn.gather.detection.pojo.po.DevData; import com.njcn.gather.detection.pojo.vo.SocketDataMsg; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; @@ -76,75 +77,91 @@ public class MsgUtil { return JSON.toJSONString(socketDataMsg); } - public static List toList(List nonHarm, List harm) { + public static List toList(List nonHarm, List harm, boolean containBaseHarm) { List info = new ArrayList<>(); // if (CollUtil.isNotEmpty(nonHarm)) { - if (CollUtil.isNotEmpty(nonHarm)) { - Map> noHarmMap = nonHarm.stream() - .collect(Collectors.groupingBy(x -> x.getMonitorId() + "_" + x.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.UTC_SIMPLE_MS_PATTERN)) + "_" + x.getSort())); - noHarmMap.forEach((key, value) -> { - String[] split = key.split("_"); - DevData data = new DevData(); - data.setTime(split[2]); - data.setId(split[0]+"_"+split[1]); - List sqlDataDTOS = new ArrayList<>(); - DevData.SqlDataDTO sqlDataDTO; - for (AdNonHarmonicResult result : value) { + if (CollUtil.isNotEmpty(nonHarm)) { + Map> noHarmMap = nonHarm.stream() + .collect(Collectors.groupingBy(x -> x.getMonitorId() + "_" + x.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.UTC_SIMPLE_MS_PATTERN)) + "_" + x.getSort())); + noHarmMap.forEach((key, value) -> { + String[] split = key.split("_"); + DevData data = new DevData(); + data.setTime(split[2]); + data.setId(split[0] + "_" + split[1]); + List sqlDataDTOS = new ArrayList<>(); + DevData.SqlDataDTO sqlDataDTO; + for (AdNonHarmonicResult result : value) { + sqlDataDTO = new DevData.SqlDataDTO(); + sqlDataDTO.setType(result.getDataType()); + 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); + listDTO.setC(StrUtil.isNotBlank(result.getCValue()) ? Double.valueOf(result.getCValue()) : null); + listDTO.setT(StrUtil.isNotBlank(result.getTValue()) ? Double.valueOf(result.getTValue()) : null); + sqlDataDTO.setList(listDTO); + sqlDataDTOS.add(sqlDataDTO); + } + data.setSqlData(sqlDataDTOS); + info.add(data); + }); + } + if (CollUtil.isNotEmpty(harm)) { + Map> harmMap = harm.stream() + .collect(Collectors.groupingBy(x -> x.getMonitorId() + "_" + x.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.UTC_SIMPLE_MS_PATTERN)))); + harmMap.forEach((key, value) -> { + List collect = info.stream().filter(x -> key.equals(x.getId() + "_" + x.getTime())).collect(Collectors.toList()); + List sqlDataDTOS = new ArrayList<>(); + DevData.SqlDataDTO sqlDataDTO; + List sqlDataHarmDTOS = new ArrayList<>(); + DevData.SqlDataHarmDTO dataHarmDTO; + for (AdHarmonicResult harmonicResult : value) { + if (containBaseHarm) { sqlDataDTO = new DevData.SqlDataDTO(); - sqlDataDTO.setType(result.getDataType()); - sqlDataDTO.setDesc(result.getAdType()); + sqlDataDTO = new DevData.SqlDataDTO(); + sqlDataDTO.setType(harmonicResult.getDataType()); + sqlDataDTO.setDesc(harmonicResult.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); - listDTO.setC(StrUtil.isNotBlank(result.getCValue()) ? Double.valueOf(result.getCValue()) : null); - listDTO.setT(StrUtil.isNotBlank(result.getTValue()) ? Double.valueOf(result.getTValue()) : null); + listDTO.setA(StrUtil.isNotBlank(harmonicResult.getAValue1()) ? Double.valueOf(harmonicResult.getAValue1()) : null); + listDTO.setB(StrUtil.isNotBlank(harmonicResult.getBValue1()) ? Double.valueOf(harmonicResult.getBValue1()) : null); + listDTO.setC(StrUtil.isNotBlank(harmonicResult.getCValue1()) ? Double.valueOf(harmonicResult.getCValue1()) : null); sqlDataDTO.setList(listDTO); sqlDataDTOS.add(sqlDataDTO); } - data.setSqlData(sqlDataDTOS); - info.add(data); - }); - } - if (CollUtil.isNotEmpty(harm)) { - Map> harmMap = harm.stream() - .collect(Collectors.groupingBy(x -> x.getMonitorId() + "_" + x.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.UTC_SIMPLE_MS_PATTERN)))); - harmMap.forEach((key, value) -> { - List collect = info.stream().filter(x -> key.equals(x.getId() + "_" + x.getTime())).collect(Collectors.toList()); - List sqlDataDTOS = new ArrayList<>(); - DevData.SqlDataHarmDTO dataDTO; - for (AdHarmonicResult harmonicResult : value) { - dataDTO = new DevData.SqlDataHarmDTO(); - dataDTO.setType(harmonicResult.getDataType()); - dataDTO.setDesc(harmonicResult.getAdType()); - dataDTO.setNum(50); - DevData.SqlDataHarmDTO.ListDTO listDTO = new DevData.SqlDataHarmDTO.ListDTO(); - listDTO.setA(reflectHarmonicValue("a", harmonicResult)); - listDTO.setB(reflectHarmonicValue("b", harmonicResult)); - listDTO.setC(reflectHarmonicValue("c", harmonicResult)); - dataDTO.setList(listDTO); - sqlDataDTOS.add(dataDTO); - } - if (CollUtil.isNotEmpty(collect)) { - collect.get(0).setSqlDataHarm(sqlDataDTOS); - } else { - String[] split = key.split("_"); - DevData data = new DevData(); - data.setTime(split[2]); - data.setId(split[0]+"_"+split[1]); - data.setSqlDataHarm(sqlDataDTOS); - info.add(data); - } - }); - } + dataHarmDTO = new DevData.SqlDataHarmDTO(); + dataHarmDTO.setType(harmonicResult.getDataType()); + dataHarmDTO.setDesc(harmonicResult.getAdType()); + dataHarmDTO.setNum(containBaseHarm ? 49 : 50); + DevData.SqlDataHarmDTO.ListDTO listHarmDTO = new DevData.SqlDataHarmDTO.ListDTO(); + listHarmDTO.setA(reflectHarmonicValue("a", harmonicResult, containBaseHarm)); + listHarmDTO.setB(reflectHarmonicValue("b", harmonicResult, containBaseHarm)); + listHarmDTO.setC(reflectHarmonicValue("c", harmonicResult, containBaseHarm)); + dataHarmDTO.setList(listHarmDTO); + sqlDataHarmDTOS.add(dataHarmDTO); + } + if (CollUtil.isNotEmpty(collect)) { + collect.get(0).setSqlDataHarm(sqlDataHarmDTOS); + } else { + String[] split = key.split("_"); + DevData data = new DevData(); + data.setTime(split[2]); + data.setId(split[0] + "_" + split[1]); + data.setSqlData(sqlDataDTOS); + data.setSqlDataHarm(sqlDataHarmDTOS); + info.add(data); + } + }); + + } // } return info; } - private static List reflectHarmonicValue(String phase, AdHarmonicResult adHarmonicResult) { + private static List reflectHarmonicValue(String phase, AdHarmonicResult adHarmonicResult, boolean notContainBaseHarm) { List info = new ArrayList<>(); - for (int i = 2; i <= 50; i++) { + for (int i = notContainBaseHarm ? 2 : 1; i <= 50; i++) { String fieldName = phase + "Value" + i; try { Field idField = AdHarmonicResult.class.getDeclaredField(fieldName); diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 3db9a36f..e524559d 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -379,7 +379,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // } StorageParam storageParam = new StorageParam(); - storageParam.setCode(Integer.valueOf(adPlan.getCode())); + storageParam.setCode(adPlan.getCode()+""); storageParam.setScriptId(adPlan.getScriptId()); List indexes = adHarmonicService.getIndex(storageParam, true); scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); diff --git a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java index a11a42cf..fcdcaca8 100644 --- a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java +++ b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java @@ -6,7 +6,6 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.gather.device.pojo.param.PqDevParam; import com.njcn.gather.result.pojo.param.ResultParam; import com.njcn.gather.result.pojo.vo.FormContentVO; import com.njcn.gather.result.pojo.vo.ResultVO; @@ -20,10 +19,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -98,4 +94,16 @@ public class ResultController extends BaseController { resultService.changeErrorSystem(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) + @GetMapping("/deleteTempTable") + @ApiOperation("删除临时表") + @ApiImplicitParam(name = "param", value = "删除参数", required = true) + public HttpResult deleteTempTable(@RequestParam("code") String code) { + String methodDescribe = getMethodDescribe("deleteTempTable"); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code); + + resultService.deleteTempTable(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java index 52c4a902..12bbc82f 100644 --- a/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java +++ b/detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java @@ -38,7 +38,7 @@ public class ResultParam { /** * 自动生成，用于生成数据表后缀 */ - private Integer code; + private String code; /** * 检测脚本序号 @@ -86,6 +86,6 @@ public class ResultParam { @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_ID_FORMAT_ERROR) private String deviceId; - private Integer code; + private String code; } } diff --git a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java index 641b2890..dc322637 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java +++ b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java @@ -52,4 +52,11 @@ public interface IResultService { * @param param */ void changeErrorSystem(ResultParam.ChangeErrorSystemParam param); + + /** + * 删除（更换误差体系时产生的）临时表 + * + * @param code + */ + void deleteTempTable(String code); } 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 a058de13..2ee669ce 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 @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum; import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum; import com.njcn.gather.detection.pojo.param.PreDetectionParam; import com.njcn.gather.detection.pojo.po.DevData; @@ -105,13 +106,13 @@ public class ResultServiceImpl implements IResultService { DictTree dictTree = dictTreeService.getById(queryParam.getScriptType()); if (HARMONIC_TYPE_CODE.contains(dictTree.getCode())) { - allResultList.addAll(adHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } else { - allResultList.addAll(adNonHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adNonHarmonicService.get(scriptId, indexList, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } } else { //查询所有的脚本类型 - allResultList.addAll(adHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); - allResultList.addAll(adNonHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode())); + allResultList.addAll(adHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); + allResultList.addAll(adNonHarmonicService.get(scriptId, null, queryParam.getDeviceId(), queryParam.getChnNum(), plan.getCode() + "")); } @@ -865,6 +866,11 @@ public class ResultServiceImpl implements IResultService { this.insertTempResultTable(param.getPlanId(), param.getScriptId(), param.getCode() + "", param.getErrorSysId(), param.getDeviceId()); } + @Override + public void deleteTempTable(String code) { + this.dropTempResultTable(code); + } + private Integer conform(Set numbers) { if (CollUtil.isNotEmpty(numbers)) { if (numbers.size() > 1) { @@ -893,7 +899,7 @@ public class ResultServiceImpl implements IResultService { * @param code */ private void createTempResultTable(String code) { - tableGenMapper.genAdHarmonicTable("drop table if exists AD_Non_Harmonic_Result_" + code + "_temp,AD_Harmonic_Result_" + code + "_temp"); + this.dropTempResultTable(code); tableGenMapper.genAdNonHarmonicResultTable(code + "_temp"); StringBuilder A = new StringBuilder(); StringBuilder B = new StringBuilder(); @@ -921,6 +927,19 @@ public class ResultServiceImpl implements IResultService { " PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)\n" + ") COMMENT='监测数据表';"; tableGenMapper.genAdHarmonicTable(sql1); + + sql1 = "CREATE TABLE ad_non_harmonic_" + code + "_temp " + "LIKE ad_non_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "INSERT INTO ad_non_harmonic_" + code + "_temp " + "SELECT * FROM ad_non_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "CREATE TABLE ad_harmonic_" + code + "_temp " + "LIKE ad_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + sql1 = "INSERT INTO ad_harmonic_" + code + "_temp " + "SELECT * FROM ad_harmonic_" + code; + tableGenMapper.genAdHarmonicTable(sql1); + } + + private void dropTempResultTable(String code) { + tableGenMapper.genAdHarmonicTable("drop table if exists AD_Non_Harmonic_Result_" + code + "_temp,AD_Harmonic_Result_" + code + "_temp," + "ad_non_harmonic_" + code + "_temp," + "ad_harmonic_" + code + "_temp"); } /** @@ -969,23 +988,25 @@ public class ResultServiceImpl implements IResultService { List sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam); sourceIssues.forEach(sourceIssue -> { - List realDataXiList = MsgUtil.toList(nonHarmonicMap.get(sourceIssue.getIndex()), harmonicMap.get(sourceIssue.getIndex())); - for (int i = 0; i < realDataXiList.size(); i++) { - DevData devData = realDataXiList.get(i); - List sqlData = devData.getSqlData(); - if (CollUtil.isNotEmpty(sqlData)) { - for (int j = 0; j < sqlData.size(); j++) { - DevData.SqlDataDTO sqlDataDTO = sqlData.get(j); - String desc = sqlDataDTO.getDesc(); - if (StrUtil.isNotBlank(desc)) { - DictTree dictTree = dictTreeService.getById(desc); - if (ObjectUtil.isNotNull(dictTree)) { - sqlDataDTO.setDesc(dictTree.getCode()); - } - } + List nonHarmonicResults = nonHarmonicMap.get(sourceIssue.getIndex()); + List harmonicResults = harmonicMap.get(sourceIssue.getIndex()); + List realDataXiList = new ArrayList<>(); + if (CollUtil.isNotEmpty(nonHarmonicResults)) { + realDataXiList.addAll(MsgUtil.toList(nonHarmonicResults, null, true)); + } + if (CollUtil.isNotEmpty(harmonicResults)) { + DictTree dictTree = dictTreeService.getById(harmonicResults.get(0).getAdType()); + if (ObjectUtil.isNotNull(dictTree)) { + if (DetectionCodeEnum.V2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode()) || DetectionCodeEnum.P2_50.getCode().equals(dictTree.getCode())) { + realDataXiList.addAll(MsgUtil.toList(null, harmonicResults, true)); + } else { + realDataXiList.addAll(MsgUtil.toList(null, harmonicResults, false)); } } + } + for (int i = 0; i < realDataXiList.size(); i++) { + DevData devData = realDataXiList.get(i); List sqlDataHarm = devData.getSqlDataHarm(); if (CollUtil.isNotEmpty(sqlDataHarm)) { for (int j = 0; j < sqlDataHarm.size(); j++) { @@ -999,6 +1020,44 @@ public class ResultServiceImpl implements IResultService { } } } + + List sqlData = devData.getSqlData(); + if (CollUtil.isNotEmpty(sqlData)) { + for (int j = 0; j < sqlData.size(); j++) { + DevData.SqlDataDTO sqlDataDTO = sqlData.get(j); + String desc = sqlDataDTO.getDesc(); + if (StrUtil.isNotBlank(desc)) { + DictTree dictTree = dictTreeService.getById(desc); + if (ObjectUtil.isNotNull(dictTree)) { + if (CollUtil.isNotEmpty(harmonicResults)) { +// if (dictTree.getCode().contains("V")) { +// sqlDataDTO.setDesc(DetectionCodeEnum.U1.getCode()); +// } +// if (dictTree.getCode().contains("I")) { +// sqlDataDTO.setDesc(DetectionCodeEnum.I1.getCode()); +// } + if (DetectionCodeEnum.V2_50.getCode().equals(dictTree.getCode())) { + sqlDataDTO.setDesc(DetectionCodeEnum.U1.getCode()); + } + if (DetectionCodeEnum.I2_50.getCode().equals(dictTree.getCode())) { + sqlDataDTO.setDesc(DetectionCodeEnum.I1.getCode()); + } +// if (DetectionCodeEnum.SV_1_49.getCode().equals(dictTree.getCode())) { +// devData.setSqlData(null); +// } +// if (DetectionCodeEnum.SI_1_49.getCode().equals(dictTree.getCode())) { +// devData.setSqlData(null); +// } +// if (DetectionCodeEnum.P2_50.getCode().equals(dictTree.getCode())) { +// devData.setSqlData(null); +// } + } else { + sqlDataDTO.setDesc(dictTree.getCode()); + } + } + } + } + } } detectionServiceImpl.processing(realDataXiList, param, devIdMapComm, sourceIssue, dataRule); }); diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java b/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java index f49bf858..ec247905 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/param/StorageParam.java @@ -35,7 +35,7 @@ public class StorageParam { /** * 自动生成，用于生成数据表后缀 */ - private Integer code; + private String code; /** * 谐波次数 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 ea045443..2178778d 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 @@ -26,7 +26,7 @@ public interface AdHarmonicService extends IService { * @param code 计划code * @return 谐波结果 */ - List get(String scriptId, List index, String deviceId, String chnNum, Integer code); + List get(String scriptId, List index, String deviceId, String chnNum, String code); /** * 查询原始数据 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 f546f256..a9ada8f2 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 @@ -23,7 +23,7 @@ public interface AdNonHarmonicService extends IService { * @param chnNum 通道号，从1开始 * @return 非谐波结果 */ - List get(String scriptId, List sort, String deviceId, String chnNum, Integer code); + List get(String scriptId, List sort, String deviceId, String chnNum, String code); /** * 非谐波原始数据展示 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 676be6f1..547e0d8c 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 @@ -47,7 +47,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl get(String scriptId, List sort, String deviceId, String chnNum, Integer code) { + public List get(String scriptId, List sort, String deviceId, String chnNum, String code) { String prefix = "ad_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + code); MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); 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 27cf03fc..47fb9d4b 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 @@ -41,7 +41,7 @@ public class AdNonHarmonicServiceImpl extends ServiceImpl get(String scriptId, List sort, String deviceId, String chnNum, Integer code) { + public List get(String scriptId, List sort, String deviceId, String chnNum, String code) { String prefix = "ad_non_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + code); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java index 8a3b8ddb..e73e4da7 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java @@ -25,7 +25,7 @@ public class TableGenServiceImpl implements TableGenService { StringBuilder A = new StringBuilder(); StringBuilder B = new StringBuilder(); StringBuilder C = new StringBuilder(); - for (int i = 1; i <= 51; i++) { + for (int i = 1; i <= 50; i++) { if (i == 1) { A.append("A_Value_").append(i).append(" json NULL COMMENT 'A相基波',"); B.append("B_Value_").append(i).append(" json NULL COMMENT 'B相基波',");