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

微调

Browse Source
This commit is contained in:
wr
2024-12-26 11:30:48 +08:00
parent 270b89ef2a
commit 514f31a50a
8 changed files with 621 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java
View File

@@ -36,7 +36,7 @@ public class PqErrSysDtls implements Serializable {
/**
* 误差判断起始值
*/
private Float startValue;
private Double startValue;
/**
* 是否包含起始值
@@ -46,7 +46,7 @@ public class PqErrSysDtls implements Serializable {
/**
* 误差判断结束值
*/
private Float endValue;
private Double endValue;
/**
* 是否包含结束值
@@ -66,7 +66,7 @@ public class PqErrSysDtls implements Serializable {
/**
* 误差最大值
*/
private Float maxErrorValue;
private Double maxErrorValue;
/**
* 误差值类型

11
device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -147,7 +147,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
List<SourceIssue.ChannelListDTO> channelListDTOS = new ArrayList<>();
//1.通道电压(ABC)
List<PqScriptDtls> volList = value.stream().filter(x -> VOL.equals(x.getValueType()) || HARM_V.equals(x.getValueType()))
List<PqScriptDtls> volList = value.stream().filter(x -> VOL.equals(x.getValueType()))
.sorted(Comparator.comparing(PqScriptDtls::getPhase))
.collect(Collectors.toList());
//谐波电压,间谐波
@@ -155,7 +155,6 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
INHARM_V.equals(x.getValueType()) ||
DIP.equals(x.getValueType()) ||
FLICKER.equals(x.getValueType())
)
.sorted(Comparator.comparing(PqScriptDtls::getPhase))
.collect(Collectors.toList());
@@ -166,7 +165,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
.sorted(Comparator.comparing(PqScriptDtls::getPhase))
.collect(Collectors.toList());
//谐波电流,间谐波电流
List<PqScriptDtls> dtlsIList = value.stream().filter(x -> HARM_I.equals(x.getValueType()) || HARM_I.equals(x.getValueType()))
List<PqScriptDtls> dtlsIList = value.stream().filter(x -> HARM_I.equals(x.getValueType()) ||
INHARM_I.equals(x.getValueType())||
DIP.equals(x.getValueType()) ||
FLICKER.equals(x.getValueType())
)
.sorted(Comparator.comparing(PqScriptDtls::getPhase))
.collect(Collectors.toList());
issueAdd(curList, dtlsIList, HARM_I, INHARM_I, freqDtls.getValue(), "I", channelListDTOS);
@@ -213,7 +216,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
* @param dtlsList 检测集合
* @param dtlsList 其他类型检测集合(谐波，间谐波等)
* @param harm 谐波
* @param harm 间谐波
* @param inHarm 间谐波
* @param fFreq 频率
* @param code U,I
* @param channelListDTOS 通道信息