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

1.微调

Browse Source
This commit is contained in:
wr
2025-02-26 20:09:31 +08:00
parent 5ee33fabdf
commit bf94ed37d9
3 changed files with 151 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ public class ResultServiceImpl implements IResultService {
} }
} else { } else {
dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂降测量准确度测试", 20, 85); dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂降测量准确度测试", 20, 85);
dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂升测量准确度测试", 110, 180); dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂升测量准确度测试", 110, 200);
dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10); dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10);
} }
@@ -272,6 +272,7 @@ public class ResultServiceImpl implements IResultService {
.collect(Collectors.toList()); .collect(Collectors.toList());
TreeDataVO vo = new TreeDataVO(); TreeDataVO vo = new TreeDataVO();
vo.setScriptTypeName(name); vo.setScriptTypeName(name);
vo.setScriptTypeCode("Base_"+start+"_"+end);
TreeDataVO dlt; TreeDataVO dlt;
for (PqScriptDtls dtls : dip) { for (PqScriptDtls dtls : dip) {
dlt = new TreeDataVO(); dlt = new TreeDataVO();

231
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -450,15 +450,17 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
if (CollUtil.isNotEmpty(channelList)) { if (CollUtil.isNotEmpty(channelList)) {
list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
for (PqScriptDtlsParam.ChannelListDTO listDTO : list) { for (PqScriptDtlsParam.ChannelListDTO listDTO : list) {
checkData = new PqScriptDtlsParam.CheckData(); if (listDTO.getChannelFlag()) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setValue(listDTO.getFPhase()); checkData.setEnable(channelListDTO.getEnable());
setCheckValue(checkArchive, checkData, listDTO); checkData.setValue(listDTO.getFPhase());
checkData.setDataType(channelListDTO.getDataType()); setCheckValue(checkArchive, checkData, listDTO);
checkData.setValueType(channelListDTO.getValueType()); checkData.setDataType(channelListDTO.getDataType());
checkData.setPid(channelListDTO.getPid()); checkData.setValueType(channelListDTO.getValueType());
info.add(checkData); checkData.setPid(channelListDTO.getPid());
info.add(checkData);
}
} }
} }
break; break;
@@ -478,27 +480,30 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
List<PqScriptDtlsParam.ChannelListDTO> channelU = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); List<PqScriptDtlsParam.ChannelListDTO> channelU = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(channelU)) { if (CollUtil.isNotEmpty(channelU)) {
for (PqScriptDtlsParam.ChannelListDTO listDTO : channelU) { for (PqScriptDtlsParam.ChannelListDTO listDTO : channelU) {
//获取电流通道 if (listDTO.getHarmFlag()) {
List<PqScriptDtlsParam.ChannelListDTO> channelI = channelList.stream() //获取电流通道
.filter(x -> x.getChannelType().contains("I" + listDTO.getChannelType().substring(1, 2))) List<PqScriptDtlsParam.ChannelListDTO> channelI = channelList.stream()
.collect(Collectors.toList()); .filter(PqScriptDtlsParam.ChannelListDTO::getHarmFlag)
if (CollUtil.isNotEmpty(channelI)) { .filter(x -> x.getChannelType().contains("I" + listDTO.getChannelType().substring(1, 2)))
List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmI = channelI.stream() .collect(Collectors.toList());
.flatMap(x -> x.getHarmList().stream()).collect(Collectors.toList()); if (CollUtil.isNotEmpty(channelI)) {
Map<Double, PqScriptDtlsParam.ChannelListDTO.HarmModel> harmIMap = harmI.stream() List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmI = channelI.stream()
.collect(Collectors.toMap(PqScriptDtlsParam.ChannelListDTO.HarmModel::getHarm, Function.identity())); .flatMap(x -> x.getHarmList().stream()).collect(Collectors.toList());
List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmList = listDTO.getHarmList(); Map<Double, PqScriptDtlsParam.ChannelListDTO.HarmModel> harmIMap = harmI.stream()
if (CollUtil.isNotEmpty(harmList)) { .collect(Collectors.toMap(PqScriptDtlsParam.ChannelListDTO.HarmModel::getHarm, Function.identity()));
for (PqScriptDtlsParam.ChannelListDTO.HarmModel harmModel : harmList) { List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmList = listDTO.getHarmList();
checkData = new PqScriptDtlsParam.CheckData(); if (CollUtil.isNotEmpty(harmList)) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); for (PqScriptDtlsParam.ChannelListDTO.HarmModel harmModel : harmList) {
checkData.setEnable(channelListDTO.getEnable()); checkData = new PqScriptDtlsParam.CheckData();
if (harmIMap.containsKey(harmModel.getHarm())) { checkData.setErrorFlag(channelListDTO.getErrorFlag());
PqScriptDtlsParam.ChannelListDTO.HarmModel i = harmIMap.get(harmModel.getHarm()); checkData.setEnable(channelListDTO.getEnable());
//电压*电流*cos（电压角度-电流角度） if (harmIMap.containsKey(harmModel.getHarm())) {
checkData.setValue(i.getFAmp() * harmModel.getFAmp() * Math.cos(harmModel.getFPhase() - i.getFPhase())); PqScriptDtlsParam.ChannelListDTO.HarmModel i = harmIMap.get(harmModel.getHarm());
//电压*电流*cos（电压角度-电流角度）
checkData.setValue(i.getFAmp() * harmModel.getFAmp()/100 * Math.cos(harmModel.getFPhase() - i.getFPhase()));
}
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
} }
} }
@@ -520,21 +525,25 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
case MAG: case MAG:
list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
for (PqScriptDtlsParam.ChannelListDTO listDTO : list) { for (PqScriptDtlsParam.ChannelListDTO listDTO : list) {
checkData = new PqScriptDtlsParam.CheckData(); if (listDTO.getDipFlag()) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setValue(listDTO.getDipData().getFTransValue()); checkData.setEnable(channelListDTO.getEnable());
setCheck(info, checkData, channelListDTO, checkArchive, listDTO); checkData.setValue(listDTO.getDipData().getFTransValue());
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
}
} }
break; break;
case DUR: case DUR:
list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
for (PqScriptDtlsParam.ChannelListDTO listDTO : list) { for (PqScriptDtlsParam.ChannelListDTO listDTO : list) {
checkData = new PqScriptDtlsParam.CheckData(); if (listDTO.getDipFlag()) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setValue(listDTO.getDipData().getRetainTime()); checkData.setEnable(channelListDTO.getEnable());
setCheck(info, checkData, channelListDTO, checkArchive, listDTO); checkData.setValue(listDTO.getDipData().getRetainTime());
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
}
} }
break; break;
case IRMS: case IRMS:
@@ -546,25 +555,26 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
break; break;
case V_UNBAN: case V_UNBAN:
list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
unbanCheck(info, channelListDTO, channelList, list, checkArchive); unbanCheck(info, channelListDTO, list, checkArchive);
break; break;
case I_UNBAN: case I_UNBAN:
list = channelList.stream().filter(x -> x.getChannelType().contains("I")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("I")).collect(Collectors.toList());
unbanCheck(info, channelListDTO, channelList, list, checkArchive); unbanCheck(info, channelListDTO, list, checkArchive);
break; break;
case PST: case PST:
if (CollUtil.isNotEmpty(channelList)) { if (CollUtil.isNotEmpty(channelList)) {
list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList()); list = channelList.stream().filter(x -> x.getChannelType().contains("U")).collect(Collectors.toList());
for (PqScriptDtlsParam.ChannelListDTO listDTO : list) { for (PqScriptDtlsParam.ChannelListDTO listDTO : list) {
checkData = new PqScriptDtlsParam.CheckData(); if (listDTO.getFlickerFlag()) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
if (ObjectUtil.isNotNull(listDTO.getFlickerData())) { checkData.setEnable(channelListDTO.getEnable());
checkData.setValue(listDTO.getFlickerData().getFlickerValue()); if (ObjectUtil.isNotNull(listDTO.getFlickerData())) {
checkData.setValue(listDTO.getFlickerData().getFlickerValue());
}
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
} }
} }
break; break;
case I1: case I1:
@@ -631,19 +641,23 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
private void unbanCheck(List<PqScriptDtlsParam.CheckData> info, private void unbanCheck(List<PqScriptDtlsParam.CheckData> info,
PqScriptDtlsParam.CheckData channelListDTO, PqScriptDtlsParam.CheckData channelListDTO,
List<PqScriptDtlsParam.ChannelListDTO> channelList,
List<PqScriptDtlsParam.ChannelListDTO> list, List<PqScriptDtlsParam.ChannelListDTO> list,
List<PqScriptCheckData> checkArchive List<PqScriptCheckData> checkArchive
) { ) {
PqScriptDtlsParam.CheckData checkData; PqScriptDtlsParam.CheckData checkData;
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
PqScriptDtlsParam.ChannelListDTO a = channelList.stream().filter(x -> x.getChannelType().contains("a")).findFirst().get();
PqScriptDtlsParam.ChannelListDTO b = channelList.stream().filter(x -> x.getChannelType().contains("b")).findFirst().get();
PqScriptDtlsParam.ChannelListDTO c = channelList.stream().filter(x -> x.getChannelType().contains("c")).findFirst().get();
checkData = new PqScriptDtlsParam.CheckData(); checkData = new PqScriptDtlsParam.CheckData();
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setEnable(channelListDTO.getEnable()); checkData.setEnable(channelListDTO.getEnable());
checkData.setValue(ThreePhaseUnbalance.calculateUnbalance(a.getFAmp(), a.getFPhase(), b.getFAmp(), b.getFPhase(), c.getFAmp(), c.getFPhase())); List<PqScriptDtlsParam.ChannelListDTO> channelA = list.stream().filter(x -> x.getChannelType().contains("a")).collect(Collectors.toList());
List<PqScriptDtlsParam.ChannelListDTO> channelB = list.stream().filter(x -> x.getChannelType().contains("b")).collect(Collectors.toList());
List<PqScriptDtlsParam.ChannelListDTO> channelC = list.stream().filter(x -> x.getChannelType().contains("c")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(channelA) && CollUtil.isNotEmpty(channelB) && CollUtil.isNotEmpty(channelC)) {
PqScriptDtlsParam.ChannelListDTO a = channelA.get(0);
PqScriptDtlsParam.ChannelListDTO b = channelB.get(0);
PqScriptDtlsParam.ChannelListDTO c = channelC.get(0);
checkData.setValue(ThreePhaseUnbalance.calculateUnbalance(a.getFAmp(), a.getFPhase(), b.getFAmp(), b.getFPhase(), c.getFAmp(), c.getFPhase()));
}
if (CollUtil.isNotEmpty(checkArchive)) { if (CollUtil.isNotEmpty(checkArchive)) {
checkData.setValue(checkArchive.get(0).getValue()); checkData.setValue(checkArchive.get(0).getValue());
} }
@@ -663,24 +677,27 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
) { ) {
PqScriptDtlsParam.CheckData checkData; PqScriptDtlsParam.CheckData checkData;
for (PqScriptDtlsParam.ChannelListDTO listDTO : list) { for (PqScriptDtlsParam.ChannelListDTO listDTO : list) {
checkData = new PqScriptDtlsParam.CheckData(); if (listDTO.getChannelFlag()) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase()); checkData.setEnable(channelListDTO.getEnable());
List<PqScriptCheckData> collect = checkArchive.stream().filter(x -> x.getPhase().equals(listDTO.getChannelType().substring(1, 2).toUpperCase())).collect(Collectors.toList()); checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase());
if (CollUtil.isNotEmpty(collect)) { List<PqScriptCheckData> collect = checkArchive.stream().filter(x -> x.getPhase().equals(listDTO.getChannelType().substring(1, 2).toUpperCase())).collect(Collectors.toList());
checkData.setValue(collect.get(0).getValue()); if (CollUtil.isNotEmpty(collect)) {
} else { checkData.setValue(collect.get(0).getValue());
if (flyDeltaV) {
checkData.setValue(0.0);
} else { } else {
checkData.setValue(listDTO.getFAmp()); if (flyDeltaV) {
checkData.setValue(0.0);
} else {
checkData.setValue(listDTO.getFAmp());
}
} }
checkData.setDataType(channelListDTO.getDataType());
checkData.setValueType(channelListDTO.getValueType());
checkData.setPid(channelListDTO.getPid());
info.add(checkData);
} }
checkData.setDataType(channelListDTO.getDataType());
checkData.setValueType(channelListDTO.getValueType());
checkData.setPid(channelListDTO.getPid());
info.add(checkData);
} }
} }
@@ -691,19 +708,21 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
) { ) {
PqScriptDtlsParam.CheckData checkData; PqScriptDtlsParam.CheckData checkData;
for (PqScriptDtlsParam.ChannelListDTO listDTO : uList) { for (PqScriptDtlsParam.ChannelListDTO listDTO : uList) {
List<PqScriptDtlsParam.ChannelListDTO.InharmModel> inharmList = listDTO.getInharmList(); if (listDTO.getInHarmFlag()) {
if (CollUtil.isNotEmpty(inharmList)) { List<PqScriptDtlsParam.ChannelListDTO.InharmModel> inharmList = listDTO.getInharmList();
for (PqScriptDtlsParam.ChannelListDTO.InharmModel inharmModel : inharmList) { if (CollUtil.isNotEmpty(inharmList)) {
checkData = new PqScriptDtlsParam.CheckData(); for (PqScriptDtlsParam.ChannelListDTO.InharmModel inharmModel : inharmList) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setValue(inharmModel.getFAmp()); checkData.setEnable(channelListDTO.getEnable());
setCheckValue(checkArchive, checkData, listDTO); checkData.setValue(inharmModel.getFAmp());
checkData.setHarmNum(inharmModel.getInharm()); setCheckValue(checkArchive, checkData, listDTO);
checkData.setDataType(channelListDTO.getDataType()); checkData.setHarmNum(inharmModel.getInharm());
checkData.setValueType(channelListDTO.getValueType()); checkData.setDataType(channelListDTO.getDataType());
checkData.setPid(channelListDTO.getPid()); checkData.setValueType(channelListDTO.getValueType());
info.add(checkData); checkData.setPid(channelListDTO.getPid());
info.add(checkData);
}
} }
} }
} }
@@ -724,20 +743,22 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
) { ) {
PqScriptDtlsParam.CheckData checkData; PqScriptDtlsParam.CheckData checkData;
for (PqScriptDtlsParam.ChannelListDTO listDTO : uList) { for (PqScriptDtlsParam.ChannelListDTO listDTO : uList) {
List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmList = listDTO.getHarmList(); if (listDTO.getHarmFlag()) {
if (CollUtil.isNotEmpty(harmList)) { List<PqScriptDtlsParam.ChannelListDTO.HarmModel> harmList = listDTO.getHarmList();
for (PqScriptDtlsParam.ChannelListDTO.HarmModel harmModel : harmList) { if (CollUtil.isNotEmpty(harmList)) {
checkData = new PqScriptDtlsParam.CheckData(); for (PqScriptDtlsParam.ChannelListDTO.HarmModel harmModel : harmList) {
checkData.setErrorFlag(channelListDTO.getErrorFlag()); checkData = new PqScriptDtlsParam.CheckData();
checkData.setEnable(channelListDTO.getEnable()); checkData.setErrorFlag(channelListDTO.getErrorFlag());
checkData.setValue(harmModel.getFAmp()); checkData.setEnable(channelListDTO.getEnable());
setCheckValue(checkArchive, checkData, listDTO); checkData.setValue(harmModel.getFAmp());
checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase()); setCheckValue(checkArchive, checkData, listDTO);
checkData.setHarmNum(harmModel.getHarm()); checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase());
checkData.setDataType(channelListDTO.getDataType()); checkData.setHarmNum(harmModel.getHarm());
checkData.setValueType(channelListDTO.getValueType()); checkData.setDataType(channelListDTO.getDataType());
checkData.setPid(channelListDTO.getPid()); checkData.setValueType(channelListDTO.getValueType());
info.add(checkData); checkData.setPid(channelListDTO.getPid());
info.add(checkData);
}
} }
} }
} }
@@ -757,15 +778,27 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
public List<PqScriptDtls> pqScriptDtls(PqScriptIssueParam param, Double volt, Double curr) { public List<PqScriptDtls> pqScriptDtls(PqScriptIssueParam param, Double volt, Double curr) {
List<PqScriptDtls> pqScriptDtls; List<PqScriptDtls> pqScriptDtls;
MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>();
List<Integer> index = new ArrayList<>();
if (StrUtil.isNotBlank(param.getScriptSubType())) {
String[] split = param.getScriptSubType().split("_");
if (split.length > 1) {
param.setScriptSubType(split[0]);
List<PqScriptDtls> pqScriptDtls1 = this.getBaseMapper().selectList(new LambdaQueryWrapper<PqScriptDtls>()
.select(PqScriptDtls::getScriptIndex)
.eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType())
.eq(StrUtil.isNotBlank(param.getScriptSubType()), PqScriptDtls::getScriptSubType, param.getScriptSubType())
.eq(PqScriptDtls::getScriptId, param.getScriptId())
.ge(PqScriptDtls::getTransValue, split[1])
.le(PqScriptDtls::getTransValue, split[2]));
index = pqScriptDtls1.stream().map(PqScriptDtls::getScriptIndex).distinct().collect(Collectors.toList());
}
}
queryWrapper.selectAll(PqScriptDtls.class) queryWrapper.selectAll(PqScriptDtls.class)
.selectAs(DictTree::getCode, PqScriptDtls::getScriptCode) .selectAs(DictTree::getCode, PqScriptDtls::getScriptCode)
.leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType) .leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType)
.eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType()) .eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType())
.eq(StrUtil.isNotBlank(param.getScriptSubType()), PqScriptDtls::getScriptSubType, param.getScriptSubType()) .eq(StrUtil.isNotBlank(param.getScriptSubType()), PqScriptDtls::getScriptSubType, param.getScriptSubType())
// .eq(PqScriptDtls::getIndex, 1) .in(CollUtil.isNotEmpty(index), PqScriptDtls::getScriptIndex, index)
// .le(PqScriptDtls::getIndex, 30)
// .in(PqScriptDtls::getIndex, Arrays.asList(1,7))
.eq(CollUtil.isNotEmpty(param.getDevIds()), PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode()) .eq(CollUtil.isNotEmpty(param.getDevIds()), PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode())
.orderByAsc(PqScriptCheckData::getScriptIndex) .orderByAsc(PqScriptCheckData::getScriptIndex)
; ;

18
storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java
View File

@@ -159,7 +159,6 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
for (Double i : harmNum) { for (Double i : harmNum) {
dataVO = new RawResultDataVO(); dataVO = new RawResultDataVO();
dataVO.setHarmNum(i); dataVO.setHarmNum(i);
dataVO.setIsData(harmonicResult.getResultFlag());
dataVO.setUnit(unit); dataVO.setUnit(unit);
try { try {
Field fieldA = harmonicResult.getClass().getDeclaredField("aValue" + isHarmOrInHarm(i).intValue()); Field fieldA = harmonicResult.getClass().getDeclaredField("aValue" + isHarmOrInHarm(i).intValue());
@@ -179,6 +178,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
if (ObjectUtil.isNotNull(a)) { if (ObjectUtil.isNotNull(a)) {
dataVO.setRadius(a.getRadius()); dataVO.setRadius(a.getRadius());
} }
dataVO.setIsData(setResultFlag(Arrays.asList(a,b,c)));
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
@@ -234,7 +234,23 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
} }
return null; return null;
} }
private Integer setResultFlag(List<RawResultDataVO.DetectionData> numbers) {
List<Integer> isData = numbers.stream().filter(x -> ObjectUtil.isNotNull(x.getData())).filter(x -> 4 != x.getIsData()).map(RawResultDataVO.DetectionData::getIsData).distinct().collect(Collectors.toList());
return getInteger(isData);
}
private static Integer getInteger(List<Integer> isData) {
if (CollUtil.isNotEmpty(isData)) {
if (isData.size() > 1) {
if (isData.contains(2)) {
return 2;
}
}
return isData.get(0);
} else {
return 4;
}
}
public Double isHarmOrInHarm(Double value) { public Double isHarmOrInHarm(Double value) {
if (value == value.longValue()) { if (value == value.longValue()) {