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
2025-01-09 19:42:31 +08:00
parent 55e7f1ce69
commit d91960700b
4 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java
View File

@@ -173,8 +173,8 @@ public class SourceIssue {
/**
* 谐波含有率
*/
@JSONField(name = "fApm", ordinal = 2)
private Double fApm;
@JSONField(name = "fAmp", ordinal = 2)
private Double fAmp;
/**
* 谐波相角
@@ -200,8 +200,8 @@ public class SourceIssue {
/**
* 间谐波含有率
*/
@JSONField(name = "fApm", ordinal = 2)
private Double fApm;
@JSONField(name = "fAmp", ordinal = 2)
private Double fAmp;
/**
* 间谐波相角

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

@@ -134,7 +134,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
*/
Map<Integer, List<PqScriptDtls>> scriptDtlsMap = pqScriptDtls.stream()
.sorted(Comparator.comparing(PqScriptDtls::getIndex))
.collect(Collectors.groupingBy(PqScriptDtls::getIndex));
.collect(Collectors.groupingBy(PqScriptDtls::getIndex, LinkedHashMap::new, Collectors.toList()));
scriptDtlsMap.forEach((key, value) -> {
/**
* 分组获取有多少小类
@@ -216,7 +216,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
queryWrapper.selectAll(PqScriptDtls.class)
.selectAs(DictTree::getCode, PqScriptDtls::getScriptCode)
.leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType)
// .eq(PqScriptDtls::getIndex, 48)
// .ge(PqScriptDtls::getIndex, 14)
// .ge(PqScriptDtls::getIndex, 30)
// .eq(PqScriptDtls::getIndex, 30)
.eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode());
if (isPhaseSequence.equals(CommonEnum.PHASE_TEST.getValue())) {
//相序
@@ -372,7 +375,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
for (PqScriptDtls pqScriptDtls : phaseHarmVList) {
harmModel = new SourceIssue.ChannelListDTO.HarmModel();
harmModel.setHarm(pqScriptDtls.getHarmNum().doubleValue());
harmModel.setFApm(pqScriptDtls.getValue());
harmModel.setFAmp(pqScriptDtls.getValue());
harmModel.setFPhase(pqScriptDtls.getAngle());
info.add(harmModel);
}
@@ -391,7 +394,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
for (PqScriptDtls pqScriptDtls : phaseHarmVList) {
inHarmModel = new SourceIssue.ChannelListDTO.InharmModel();
inHarmModel.setInharm(pqScriptDtls.getHarmNum());
inHarmModel.setFApm(pqScriptDtls.getValue());
inHarmModel.setFAmp(pqScriptDtls.getValue());
inHarmModel.setFPhase(pqScriptDtls.getAngle());
info.add(inHarmModel);
}