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-04-25 14:34:00 +08:00
parent b471a05181
commit c96cadc5d1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -1112,7 +1112,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream()); XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream());
SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam(); SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam();
singleNonHarmParam.setPlanCode(Integer.valueOf(devReportParam.getPlanCode())); singleNonHarmParam.setPlanCode(devReportParam.getPlanCode());
singleNonHarmParam.setDevId(pqDevVO.getId()); singleNonHarmParam.setDevId(pqDevVO.getId());
singleNonHarmParam.setChannelNo(i); singleNonHarmParam.setChannelNo(i);

2
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -311,7 +311,7 @@ public class ResultServiceImpl implements IResultService {
dlt = new TreeDataVO(); dlt = new TreeDataVO();
List<PqScriptDtls> scriptDtlIndexList = subValue.stream().filter(x -> dtls.getScriptIndex().equals(x.getScriptIndex())).collect(Collectors.toList()); List<PqScriptDtls> scriptDtlIndexList = subValue.stream().filter(x -> dtls.getScriptIndex().equals(x.getScriptIndex())).collect(Collectors.toList());
//特征幅值=20%Un，持续时间=1周波 //特征幅值=20%Un，持续时间=1周波
dlt.setScriptTypeName("特征幅值=" + dtls.getTransValue() + "%Un，持续时间=" + dtls.getRetainTime().intValue() + "周波"); dlt.setScriptTypeName("特征幅值=" + dtls.getTransValue() + "%Un，持续时间=" + dtls.getRetainTime() + "周波");
dlt.setIndex(dtls.getScriptIndex()); dlt.setIndex(dtls.getScriptIndex());
dlt.setScriptType(scriptDtlIndexList.get(0).getScriptType()); dlt.setScriptType(scriptDtlIndexList.get(0).getScriptType());
dlt.setScriptTypeCode("Base_" + start + "_" + end); dlt.setScriptTypeCode("Base_" + start + "_" + end);

10
storage/src/main/java/com/njcn/gather/storage/pojo/param/SingleNonHarmParam.java
View File

@@ -23,7 +23,7 @@ public class SingleNonHarmParam implements Serializable {
/** /**
* 检测计划编码 * 检测计划编码
*/ */
private Integer planCode; private String planCode;
/** /**
* 被检设备ID * 被检设备ID
@@ -53,7 +53,7 @@ public class SingleNonHarmParam implements Serializable {
private List<Integer> sortList; private List<Integer> sortList;
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, Integer sort) { public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, Integer sort) {
this.planCode = planCode; this.planCode = String.valueOf(planCode);
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.adType = adType; this.adType = adType;
@@ -61,7 +61,7 @@ public class SingleNonHarmParam implements Serializable {
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, List<Integer> sortList) { public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, String adType, List<Integer> sortList) {
this.planCode = planCode; this.planCode = String.valueOf(planCode);
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.adType = adType; this.adType = adType;
@@ -69,7 +69,7 @@ public class SingleNonHarmParam implements Serializable {
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, Integer sort) { public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, Integer sort) {
this.planCode = planCode; this.planCode = String.valueOf(planCode);
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.valueTypeList = valueTypeList; this.valueTypeList = valueTypeList;
@@ -77,7 +77,7 @@ public class SingleNonHarmParam implements Serializable {
} }
public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, List<Integer> sortList) { public SingleNonHarmParam(Integer planCode, String devId, Integer channelNo, List<String> valueTypeList, List<Integer> sortList) {
this.planCode = planCode; this.planCode = String.valueOf(planCode);
this.devId = devId; this.devId = devId;
this.channelNo = channelNo; this.channelNo = channelNo;
this.valueTypeList = valueTypeList; this.valueTypeList = valueTypeList;