From c96cadc5d17d57e453805479874af1db95aaa5fb Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 25 Apr 2025 14:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=80=81=E5=91=A8=E6=B3=A2=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=98=AF=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/PqReportServiceImpl.java | 2 +- .../gather/result/service/impl/ResultServiceImpl.java | 2 +- .../gather/storage/pojo/param/SingleNonHarmParam.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 4e696fe4..7446f336 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 @@ -1112,7 +1112,7 @@ public class PqReportServiceImpl extends ServiceImpl i XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream()); SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam(); - singleNonHarmParam.setPlanCode(Integer.valueOf(devReportParam.getPlanCode())); + singleNonHarmParam.setPlanCode(devReportParam.getPlanCode()); singleNonHarmParam.setDevId(pqDevVO.getId()); singleNonHarmParam.setChannelNo(i); 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 da734407..f7b7fd08 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 @@ -311,7 +311,7 @@ public class ResultServiceImpl implements IResultService { dlt = new TreeDataVO(); List scriptDtlIndexList = subValue.stream().filter(x -> dtls.getScriptIndex().equals(x.getScriptIndex())).collect(Collectors.toList()); //特征幅值=20%Un，持续时间=1周波 - dlt.setScriptTypeName("特征幅值=" + dtls.getTransValue() + "%Un，持续时间=" + dtls.getRetainTime().intValue() + "周波"); + dlt.setScriptTypeName("特征幅值=" + dtls.getTransValue() + "%Un，持续时间=" + dtls.getRetainTime() + "周波"); dlt.setIndex(dtls.getScriptIndex()); dlt.setScriptType(scriptDtlIndexList.get(0).getScriptType()); dlt.setScriptTypeCode("Base_" + start + "_" + end); diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java b/storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java index 252f2ae5..684940ef 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java @@ -23,7 +23,7 @@ public class SingleNonHarmParam implements Serializable { /** * 检测计划编码 */ - private Integer planCode; + private String planCode; /** * 被检设备ID @@ -53,7 +53,7 @@ public class SingleNonHarmParam implements Serializable { private List sortList; public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, Integer sort) { - this.planCode = planCode; + this.planCode = String.valueOf(planCode); this.devId = devId; this.channelNo = channelNo; this.adType = adType; @@ -61,7 +61,7 @@ public class SingleNonHarmParam implements Serializable { } public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, List sortList) { - this.planCode = planCode; + this.planCode = String.valueOf(planCode); this.devId = devId; this.channelNo = channelNo; this.adType = adType; @@ -69,7 +69,7 @@ public class SingleNonHarmParam implements Serializable { } public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List valueTypeList, Integer sort) { - this.planCode = planCode; + this.planCode = String.valueOf(planCode); this.devId = devId; this.channelNo = channelNo; this.valueTypeList = valueTypeList; @@ -77,7 +77,7 @@ public class SingleNonHarmParam implements Serializable { } public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List valueTypeList, List sortList) { - this.planCode = planCode; + this.planCode = String.valueOf(planCode); this.devId = devId; this.channelNo = channelNo; this.valueTypeList = valueTypeList;