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 298dc95c..8ede6657 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 @@ -199,7 +199,7 @@ public class SocketSourceResponseService { phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); phaseSequenceParam.setReadCount(3); - phaseSequenceParam.setIgnoreCount(7); + phaseSequenceParam.setIgnoreCount(8); socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index c6db00f0..3ef6a2f6 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -1474,7 +1474,12 @@ public class PqReportServiceImpl extends ServiceImpl i //String scriptId = adPlan.getScriptId(); Integer devChns = pqDevVO.getDevChns(); for (int i = 1; i <= devChns; i++) { - ClassPathResource resource = new ClassPathResource("/model/report_table.docx"); + String path="/model/report_table.docx"; + DevType devType = devTypeService.getById(pqDevVO.getDevType()); + if(devType.getName().equals("PQ-COM")){ + path="/model/report_table - PQ-COM.docx"; + } + ClassPathResource resource = new ClassPathResource(path); XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream()); SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam(); diff --git a/entrance/src/main/resources/model/report_table - PQ-COM.docx b/entrance/src/main/resources/model/report_table - PQ-COM.docx new file mode 100644 index 00000000..bffc3ace Binary files /dev/null and b/entrance/src/main/resources/model/report_table - PQ-COM.docx differ