ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监测点修改同步状态调整、脚本新增福禄克专用字段

Browse Source
This commit is contained in:
caozehui
2025-11-17 16:32:52 +08:00
parent 5539cb2887
commit f81123c3f7
10 changed files with 138 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java
View File

@@ -182,6 +182,8 @@ public class SocketContrastResponseService {
FormalTestManager.pstDataType = null; FormalTestManager.pstDataType = null;
FormalTestManager.isPstData = false; FormalTestManager.isPstData = false;
FormalTestManager.isWaveCheck = false; FormalTestManager.isWaveCheck = false;
FormalTestManager.isXu = true;
// FormalTestManager.isXu = param.getXXu();
FormalTestManager.nonWaveDataSourceEnum = null; FormalTestManager.nonWaveDataSourceEnum = null;
String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(","); String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(",");
@@ -716,9 +718,14 @@ public class SocketContrastResponseService {
} else if (FormalTestManager.isWaveCheck) { } else if (FormalTestManager.isWaveCheck) {
System.out.println("(仅有录波)模型一致性校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》》》》》》》》》》》》"); System.out.println("(仅有录波)模型一致性校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》》》》》》》》》》》》");
this.sendXu(s); if (FormalTestManager.isXu) {
this.resetTimer(); this.sendXu(s);
FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; 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(); this.clearData();
System.out.println("数据对齐校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》"); if (FormalTestManager.isXu) {
this.sendXu(s); System.out.println("数据对齐校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始相序校验》》》》》》》》》》》》》》》》");
FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY; this.sendXu(s);
FormalTestManager.currentStep = SourceOperateCodeEnum.YJC_XUJY;
} else {
System.out.println("跳过相序校验！");
this.sendFormalTest(s, param, requestOperateCode, quitOperateCode);
}
this.resetTimer(); this.resetTimer();
} }
} }
@@ -1035,60 +1047,7 @@ public class SocketContrastResponseService {
webSend.setCode(SourceResponseCodeEnum.ALL_SUCCESS.getCode());//最终成功推送 webSend.setCode(SourceResponseCodeEnum.ALL_SUCCESS.getCode());//最终成功推送
WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend)); WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
// 后续做正式检测 this.sendFormalTest(s, param, requestOperateCode, quitOperateCode);
if (param.getTestItemList().get(2)) {
System.out.println("相序校验成功！》》》》》》》》》》》》》》》》》》》》》》》》》》》》》开始正式检测》》》》》》》》》》》》》》》》");
if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
SocketMsg<String> 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<String> 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;
}
} }
} else if (successComm.size() == FormalTestManager.monitorMap.size()) { } else if (successComm.size() == FormalTestManager.monitorMap.size()) {
this.clearData(); 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<String> 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<String> 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;
}
}
/** /**
* 正式检测 * 正式检测
* *

5
detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java
View File

@@ -43,4 +43,9 @@ public class ContrastDetectionParam {
private List<Boolean> testItemList; private List<Boolean> testItemList;
private String userId; private String userId;
/**
* 是否进行相许校验
*/
private Boolean xXu;
} }

5
detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
View File

@@ -203,4 +203,9 @@ public class FormalTestManager {
* 当前下发的脚本 * 当前下发的脚本
*/ */
public static SourceIssue currentIssue; public static SourceIssue currentIssue;
/**
* 是否进行相序校验
*/
public static boolean isXu;
} }

56
detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java
View File

@@ -135,34 +135,38 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
// 同步更新计划的状态 // 同步更新计划的状态
AdPlan plan = this.baseMapper.getPlanByDevId(devId); AdPlan plan = this.baseMapper.getPlanByDevId(devId);
List<PqDevSub> devSubList = this.baseMapper.listDevSubByPlanId(plan.getId()); if (ObjectUtil.isNotNull(plan)) {
List<PqDevSub> checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList());
List<PqDevSub> 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<PqDevSub> accordDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getCheckResult() == CheckResultEnum.ACCORD.getValue()).collect(Collectors.toList()); List<PqDevSub> devSubList = this.baseMapper.listDevSubByPlanId(plan.getId());
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<PqDevSub> generatedDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getReportState() == DevReportStateEnum.GENERATED.getValue()).collect(Collectors.toList()); List<PqDevSub> checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList());
if (generatedDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) { List<PqDevSub> checkingDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKING.getValue()).collect(Collectors.toList());
this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getValue()); if (checkedDevSubList.size() == devSubList.size() && devSubList.size() > 0) {
} else if (generatedDevSubList.size() > 0) { this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKED.getValue());
this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getValue()); } else if (checkedDevSubList.size() > 0 || checkingDevSubList.size() > 0) {
} else { this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKING.getValue());
this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue()); } else {
this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.UNCHECKED.getValue());
}
List<PqDevSub> 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<PqDevSub> 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); return this.saveOrUpdateBatch(newMonitorList);
} }
@@ -439,7 +443,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
wrapper.eq("pq_monitor.Dev_Id", devId) wrapper.eq("pq_monitor.Dev_Id", devId)
.eq("pq_monitor.Num", monitorNum); .eq("pq_monitor.Num", monitorNum);
List<PqMonitor> pqMonitors = this.list(wrapper); List<PqMonitor> pqMonitors = this.list(wrapper);
if(CollUtil.isNotEmpty(pqMonitors)){ if (CollUtil.isNotEmpty(pqMonitors)) {
return pqMonitors.get(0); return pqMonitors.get(0);
} }
return null; return null;

4
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -1554,8 +1554,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} }
// 检测脚本 // 检测脚本
List<Map<String, Object>> maps1 = pqScriptService.listAllPqScript(null); List<PqScript> pqScriptList = pqScriptService.listAllPqScript(null);
List<String> scriptNameList = maps1.stream().map(m -> (String) m.get("name")).collect(Collectors.toList()); List<String> scriptNameList = pqScriptList.stream().map(m -> m.getName()).collect(Collectors.toList());
pullDown = new PullDown(); pullDown = new PullDown();
pullDown.setFirstCol(3); pullDown.setFirstCol(3);
pullDown.setLastCol(3); pullDown.setLastCol(3);

4
detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java
View File

@@ -126,10 +126,10 @@ public class PqScriptController extends BaseController {
@GetMapping("/getAll") @GetMapping("/getAll")
@ApiOperation("获取指定模式下的所有检测脚本") @ApiOperation("获取指定模式下的所有检测脚本")
@ApiImplicitParam(name = "patternId", value = "模式Id", required = true) @ApiImplicitParam(name = "patternId", value = "模式Id", required = true)
public HttpResult<List<Map<String, Object>>> getAllPqScript(@RequestParam("patternId") String patternId) { public HttpResult<List<PqScript>> getAllPqScript(@RequestParam("patternId") String patternId) {
String methodDescribe = getMethodDescribe("getAllPqScript"); String methodDescribe = getMethodDescribe("getAllPqScript");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId);
List<Map<String, Object>> result = pqScriptService.listAllPqScript(patternId); List<PqScript> result = pqScriptService.listAllPqScript(patternId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }

3
detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
View File

@@ -72,6 +72,9 @@ public class PqScriptParam {
@Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR) @Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
private Double ratedCurr; private Double ratedCurr;
@ApiModelProperty("是否为Fluke专用脚本")
private Integer fluke;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

5
detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java
View File

@@ -73,6 +73,11 @@ public class PqScript extends BaseEntity implements Serializable {
*/ */
private Double ratedCurr; private Double ratedCurr;
/**
* 是否为福禄克专用脚本。0-否 1-是
*/
private Integer fluke;
/** /**
* 状态：0-删除 1-正常 * 状态：0-删除 1-正常
*/ */

2
detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java
View File

@@ -68,7 +68,7 @@ public interface IPqScriptService extends IService<PqScript> {
* @param patternId 模式id * @param patternId 模式id
* @return 检测脚本列表 * @return 检测脚本列表
*/ */
List<Map<String, Object>> listAllPqScript(String patternId); List<PqScript> listAllPqScript(String patternId);
/** /**
* 根据脚本名称查询脚本 * 根据脚本名称查询脚本

18
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java
View File

@@ -112,15 +112,15 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
} }
@Override @Override
public List<Map<String, Object>> listAllPqScript(String patternId) { public List<PqScript> listAllPqScript(String patternId) {
List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list(); List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> { // List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
Map<String, Object> map = new HashMap<>(); // Map<String, Object> map = new HashMap<>();
map.put("id", pqScript.getId()); // map.put("id", pqScript.getId());
map.put("name", pqScript.getName()); // map.put("name", pqScript.getName());
return map; // return map;
}).collect(Collectors.toList()); // }).collect(Collectors.toList());
return result; return pqScriptList;
} }
@Override @Override
@@ -139,7 +139,7 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
wrapper.eq("state", DataStateEnum.ENABLE.getCode()); wrapper.eq("state", DataStateEnum.ENABLE.getCode());
wrapper.eq("name", param.getName()); wrapper.eq("name", param.getName());
if (isExcludeSelf) { if (isExcludeSelf) {
if(param instanceof PqScriptParam.UpdateParam){ if (param instanceof PqScriptParam.UpdateParam) {
wrapper.ne("id", ((PqScriptParam.UpdateParam) param).getId()); wrapper.ne("id", ((PqScriptParam.UpdateParam) param).getId());
} }
} }