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 db26f563..f47a744d 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 @@ -182,6 +182,8 @@ public class SocketContrastResponseService { FormalTestManager.pstDataType = null; FormalTestManager.isPstData = false; FormalTestManager.isWaveCheck = false; + FormalTestManager.isXu = true; +// FormalTestManager.isXu = param.getXXu(); FormalTestManager.nonWaveDataSourceEnum = null; String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(","); @@ -716,9 +718,14 @@ public class SocketContrastResponseService { } else if (FormalTestManager.isWaveCheck) { System.out.println("(仅有录波)模型一致性校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》》》》》》》》》》》》"); - this.sendXu(s); - this.resetTimer(); - FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; + if (FormalTestManager.isXu) { + this.sendXu(s); + this.resetTimer(); + FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; + } else { + System.out.println("跳过相序校验！"); + this.sendFormalTest(s, param, requestOperateCode, quitOperateCode); + } } } } @@ -909,9 +916,14 @@ public class SocketContrastResponseService { this.clearData(); - System.out.println("数据对齐校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》"); - this.sendXu(s); - FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; + if (FormalTestManager.isXu) { + System.out.println("数据对齐校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》"); + this.sendXu(s); + FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; + } else { + System.out.println("跳过相序校验！"); + this.sendFormalTest(s, param, requestOperateCode, quitOperateCode); + } this.resetTimer(); } } @@ -1035,60 +1047,7 @@ public class SocketContrastResponseService { webSend.setCode(SourceResponseCodeEnum.ALL_SUCCESS.getCode());//最终成功推送 WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend)); - // 后续做正式检测 - if (param.getTestItemList().get(2)) { - System.out.println("相序校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始正式检测》》》》》》》》》》》》》》》》"); - if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) { - SocketMsg socketMsg = new SocketMsg<>(); - socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue()); - socketMsg.setOperateCode(requestOperateCode.getValue()); - DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam(); - phaseSequenceParam.setMoniterIdList(Arrays.asList(FormalTestManager.monitorMap.keySet().toArray(new String[FormalTestManager.monitorMap.size()]))); - List allDataType = this.getAllDataType(); - FormalTestManager.pstDataType = new ArrayList<>(); - if (allDataType.contains(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode())) { - FormalTestManager.pstDataType.add(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode()); - allDataType.remove(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode()); - } - if (CollUtil.isNotEmpty(allDataType)) { - phaseSequenceParam.setDataType(allDataType); - } else { - if (CollUtil.isNotEmpty(FormalTestManager.pstDataType)) { - FormalTestManager.isPstData = true; - socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue()); - phaseSequenceParam.setDataType(FormalTestManager.pstDataType); - } - } - phaseSequenceParam.setReadCount(this.getReadCount(this.getTargetCount())); - phaseSequenceParam.setIgnoreCount(0); - socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); - - FormalTestManager.currentStep = SourceOperateCodeEnum.FORMAL_REAL; - SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); - this.resetTimer(); - checkResult = false; - } else if (FormalTestManager.isWaveCheck) { - if (FormalTestManager.statisticsProtocol && quitOperateCode == SourceOperateCodeEnum.QUIT_INIT_02) { - CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false); - } - // 录波数据 - CnSocketUtil.contrastSendquit(param.getUserPageId(), quitOperateCode, false); - successComm.clear(); - failComm.clear(); - FormalTestManager.currentStep = SourceOperateCodeEnum.RECORD_WAVE_STEP1; - // 发送录波指令 - this.sendRecordWave(s); - } - } else { - if (FormalTestManager.statisticsProtocol && quitOperateCode == SourceOperateCodeEnum.QUIT_INIT_02) { - CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false); - } - if (FormalTestManager.voltageProtocol) { - CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false); - } - CnSocketUtil.contrastSendquit(param.getUserPageId(), quitOperateCode, false); - FormalTestManager.isTesting = false; - } + this.sendFormalTest(s, param, requestOperateCode, quitOperateCode); } } else if (successComm.size() == FormalTestManager.monitorMap.size()) { this.clearData(); @@ -1174,6 +1133,63 @@ public class SocketContrastResponseService { } } + private void sendFormalTest(String s, PreDetectionParam param, SourceOperateCodeEnum requestOperateCode, SourceOperateCodeEnum quitOperateCode) { + // 后续做正式检测 + if (param.getTestItemList().get(2)) { + System.out.println("开始正式检测！"); + if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) { + SocketMsg socketMsg = new SocketMsg<>(); + socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue()); + socketMsg.setOperateCode(requestOperateCode.getValue()); + DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam(); + phaseSequenceParam.setMoniterIdList(Arrays.asList(FormalTestManager.monitorMap.keySet().toArray(new String[FormalTestManager.monitorMap.size()]))); + List allDataType = this.getAllDataType(); + FormalTestManager.pstDataType = new ArrayList<>(); + if (allDataType.contains(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode())) { + FormalTestManager.pstDataType.add(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode()); + allDataType.remove(DetectionCodeEnum.AVG_PREFIX.getCode() + DetectionCodeEnum.PST.getCode()); + } + if (CollUtil.isNotEmpty(allDataType)) { + phaseSequenceParam.setDataType(allDataType); + } else { + if (CollUtil.isNotEmpty(FormalTestManager.pstDataType)) { + FormalTestManager.isPstData = true; + socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue()); + phaseSequenceParam.setDataType(FormalTestManager.pstDataType); + } + } + phaseSequenceParam.setReadCount(this.getReadCount(this.getTargetCount())); + phaseSequenceParam.setIgnoreCount(0); + socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); + + FormalTestManager.currentStep = SourceOperateCodeEnum.FORMAL_REAL; + SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); + this.resetTimer(); + checkResult = false; + } else if (FormalTestManager.isWaveCheck) { + if (FormalTestManager.statisticsProtocol && quitOperateCode == SourceOperateCodeEnum.QUIT_INIT_02) { + CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false); + } + // 录波数据 + CnSocketUtil.contrastSendquit(param.getUserPageId(), quitOperateCode, false); + successComm.clear(); + failComm.clear(); + FormalTestManager.currentStep = SourceOperateCodeEnum.RECORD_WAVE_STEP1; + // 发送录波指令 + this.sendRecordWave(s); + } + } else { + if (FormalTestManager.statisticsProtocol && quitOperateCode == SourceOperateCodeEnum.QUIT_INIT_02) { + CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false); + } + if (FormalTestManager.voltageProtocol) { + CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false); + } + CnSocketUtil.contrastSendquit(param.getUserPageId(), quitOperateCode, false); + FormalTestManager.isTesting = false; + } + } + /** * 正式检测 * diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java b/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java index 2987bce9..f4850a60 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java @@ -43,4 +43,9 @@ public class ContrastDetectionParam { private List testItemList; private String userId; + + /** + * 是否进行相许校验 + */ + private Boolean xXu; } diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java index 21d09e6f..9ce8d743 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java @@ -203,4 +203,9 @@ public class FormalTestManager { * 当前下发的脚本 */ public static SourceIssue currentIssue; + + /** + * 是否进行相序校验 + */ + public static boolean isXu; } 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 82526229..7661172c 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 @@ -135,34 +135,38 @@ public class PqMonitorServiceImpl extends ServiceImpl devSubList = this.baseMapper.listDevSubByPlanId(plan.getId()); + if (ObjectUtil.isNotNull(plan)) { - List checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList()); - List checkingDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKING.getValue()).collect(Collectors.toList()); - if (checkedDevSubList.size() == devSubList.size() && devSubList.size() > 0) { - this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKED.getValue()); - } else if (checkedDevSubList.size() > 0 || checkingDevSubList.size() > 0) { - this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKING.getValue()); - } else { - this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.UNCHECKED.getValue()); - } - List accordDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getCheckResult() == CheckResultEnum.ACCORD.getValue()).collect(Collectors.toList()); - if (accordDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) { - this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.ACCORD.getValue()); - } else if (accordDevSubList.size() > 0) { - this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.NOT_ACCORD.getValue()); - } else { - this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.UNCHECKED.getValue()); - } + List devSubList = this.baseMapper.listDevSubByPlanId(plan.getId()); - List generatedDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getReportState() == DevReportStateEnum.GENERATED.getValue()).collect(Collectors.toList()); - if (generatedDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) { - this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getValue()); - } else if (generatedDevSubList.size() > 0) { - this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getValue()); - } else { - this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue()); + List checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList()); + List checkingDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKING.getValue()).collect(Collectors.toList()); + if (checkedDevSubList.size() == devSubList.size() && devSubList.size() > 0) { + this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKED.getValue()); + } else if (checkedDevSubList.size() > 0 || checkingDevSubList.size() > 0) { + this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKING.getValue()); + } else { + this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.UNCHECKED.getValue()); + } + + List accordDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getCheckResult() == CheckResultEnum.ACCORD.getValue()).collect(Collectors.toList()); + if (accordDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) { + this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.ACCORD.getValue()); + } else if (accordDevSubList.size() > 0) { + this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.NOT_ACCORD.getValue()); + } else { + this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.UNCHECKED.getValue()); + } + + List generatedDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getReportState() == DevReportStateEnum.GENERATED.getValue()).collect(Collectors.toList()); + if (generatedDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) { + this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getValue()); + } else if (generatedDevSubList.size() > 0) { + this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getValue()); + } else { + this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue()); + } } return this.saveOrUpdateBatch(newMonitorList); } @@ -439,7 +443,7 @@ public class PqMonitorServiceImpl extends ServiceImpl pqMonitors = this.list(wrapper); - if(CollUtil.isNotEmpty(pqMonitors)){ + if (CollUtil.isNotEmpty(pqMonitors)) { return pqMonitors.get(0); } return null; 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 4581d8d2..f80ac667 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 @@ -1554,8 +1554,8 @@ public class AdPlanServiceImpl extends ServiceImpl impleme } // 检测脚本 - List> maps1 = pqScriptService.listAllPqScript(null); - List scriptNameList = maps1.stream().map(m -> (String) m.get("name")).collect(Collectors.toList()); + List pqScriptList = pqScriptService.listAllPqScript(null); + List scriptNameList = pqScriptList.stream().map(m -> m.getName()).collect(Collectors.toList()); pullDown = new PullDown(); pullDown.setFirstCol(3); pullDown.setLastCol(3); diff --git a/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java b/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java index c7c2797f..f17fe981 100644 --- a/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java +++ b/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java @@ -126,10 +126,10 @@ public class PqScriptController extends BaseController { @GetMapping("/getAll") @ApiOperation("获取指定模式下的所有检测脚本") @ApiImplicitParam(name = "patternId", value = "模式Id", required = true) - public HttpResult>> getAllPqScript(@RequestParam("patternId") String patternId) { + public HttpResult> getAllPqScript(@RequestParam("patternId") String patternId) { String methodDescribe = getMethodDescribe("getAllPqScript"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId); - List> result = pqScriptService.listAllPqScript(patternId); + List result = pqScriptService.listAllPqScript(patternId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java index 7c2213e4..a1cd1d42 100644 --- a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java @@ -72,6 +72,9 @@ public class PqScriptParam { @Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR) private Double ratedCurr; + @ApiModelProperty("是否为Fluke专用脚本") + private Integer fluke; + @Data @EqualsAndHashCode(callSuper = true) diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java index 9a06053c..2ada119c 100644 --- a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java @@ -73,6 +73,11 @@ public class PqScript extends BaseEntity implements Serializable { */ private Double ratedCurr; + /** + * 是否为福禄克专用脚本。0-否 1-是 + */ + private Integer fluke; + /** * 状态：0-删除 1-正常 */ diff --git a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java index c113b917..60aeb776 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java @@ -68,7 +68,7 @@ public interface IPqScriptService extends IService { * @param patternId 模式id * @return 检测脚本列表 */ - List> listAllPqScript(String patternId); + List listAllPqScript(String patternId); /** * 根据脚本名称查询脚本 diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java index e0131e49..5d8ac82e 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java @@ -112,15 +112,15 @@ public class PqScriptServiceImpl extends ServiceImpl i } @Override - public List> listAllPqScript(String patternId) { + public List listAllPqScript(String patternId) { List pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list(); - List> result = pqScriptList.stream().map(pqScript -> { - Map map = new HashMap<>(); - map.put("id", pqScript.getId()); - map.put("name", pqScript.getName()); - return map; - }).collect(Collectors.toList()); - return result; +// List> result = pqScriptList.stream().map(pqScript -> { +// Map map = new HashMap<>(); +// map.put("id", pqScript.getId()); +// map.put("name", pqScript.getName()); +// return map; +// }).collect(Collectors.toList()); + return pqScriptList; } @Override @@ -139,7 +139,7 @@ public class PqScriptServiceImpl extends ServiceImpl i wrapper.eq("state", DataStateEnum.ENABLE.getCode()); wrapper.eq("name", param.getName()); if (isExcludeSelf) { - if(param instanceof PqScriptParam.UpdateParam){ + if (param instanceof PqScriptParam.UpdateParam) { wrapper.ne("id", ((PqScriptParam.UpdateParam) param).getId()); } }