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-06 10:34:53 +08:00
parent 6b6ec07be2
commit 6040dee569
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,11 +113,11 @@ public class ResultServiceImpl implements IResultService {
public List<TreeDataVO> treeData(ResultParam param) { public List<TreeDataVO> treeData(ResultParam param) {
//根据所有的检测脚本查询出检测信息 //根据所有的检测脚本查询出检测信息
List<PqScriptDtls> dtlsList = pqScriptDtlsService.list(new MPJLambdaWrapper<PqScriptDtls>() List<PqScriptDtls> dtlsList = pqScriptDtlsService.list(new MPJLambdaWrapper<PqScriptDtls>()
.selectAll(PqScriptDtls.class) .selectAll(PqScriptDtls.class)
.eq(StrUtil.isNotBlank(param.getScriptId()), PqScriptDtls::getScriptId, param.getScriptId()) .eq(StrUtil.isNotBlank(param.getScriptId()), PqScriptDtls::getScriptId, param.getScriptId())
.eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType()) .eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType())
.ne(PqScriptDtls::getIndex, -1) .ne(PqScriptDtls::getIndex, -1)
.eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode()) .eq(PqScriptDtls::getEnable, DataStateEnum.ENABLE.getCode())
); );
List<AdBaseResult> allResultList = new ArrayList<>(); List<AdBaseResult> allResultList = new ArrayList<>();
List<Integer> indexList = new ArrayList<>(); List<Integer> indexList = new ArrayList<>();
@@ -182,9 +182,9 @@ public class ResultServiceImpl implements IResultService {
subType.setChildren(subTypeList); subType.setChildren(subTypeList);
scriptSubList.add(subType); scriptSubList.add(subType);
} 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, 180);
dipScriptTypeName(subValue, scriptSubList,finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10); dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压中断测量准确度测试", 0, 10);
} }
}); });
@@ -240,7 +240,7 @@ public class ResultServiceImpl implements IResultService {
return infoVOS; return infoVOS;
} }
private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList,Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) { private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList, Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) {
List<TreeDataVO> info = new ArrayList<>(); List<TreeDataVO> info = new ArrayList<>();
List<PqScriptDtls> dip = subValue.stream() List<PqScriptDtls> dip = subValue.stream()
.filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase())) .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase()))
@@ -251,7 +251,7 @@ public class ResultServiceImpl implements IResultService {
vo.setScriptTypeName(name); vo.setScriptTypeName(name);
TreeDataVO dlt; TreeDataVO dlt;
for (PqScriptDtls dtls : dip) { for (PqScriptDtls dtls : dip) {
if(finalResultMap.containsKey(dtls.getIndex())){ if (finalResultMap.containsKey(dtls.getIndex())) {
dlt = new TreeDataVO(); dlt = new TreeDataVO();
List<PqScriptDtls> scriptDtlIndexList = subValue.stream().filter(x -> dtls.getIndex().equals(x.getIndex())).collect(Collectors.toList()); List<PqScriptDtls> scriptDtlIndexList = subValue.stream().filter(x -> dtls.getIndex().equals(x.getIndex())).collect(Collectors.toList());
//特征幅值=20%Un，持续时间=1周波 //特征幅值=20%Un，持续时间=1周波
@@ -780,25 +780,30 @@ public class ResultServiceImpl implements IResultService {
@Override @Override
public ResultVO resultData(ResultParam param) { public ResultVO resultData(ResultParam param) {
StorageParam storage=new StorageParam(); StorageParam storage = new StorageParam();
storage.setIndex(param.getIndex()); storage.setIndex(param.getIndex());
storage.setScriptId(param.getScriptId()); storage.setScriptId(param.getScriptId());
storage.setDevId(param.getDevId()); storage.setDevId(param.getDevId());
storage.setDevNum(param.getDevNum()); storage.setDevNum(param.getDevNum());
storage.setCode(param.getCode()); storage.setCode(param.getCode());
List<PqScriptCheckData> list = pqScriptCheckDataService.list(new MPJLambdaWrapper<PqScriptCheckData>() DictTree dictTree = dictTreeService.getById(param.getScriptType());
.distinct() List<Double> harmNum = new ArrayList<>();
.select(PqScriptCheckData::getHarmNum) if (HARMONIC_TYPE_CODE.contains(dictTree.getCode())) {
.eq(PqScriptCheckData::getScriptId, param.getScriptId()) List<PqScriptCheckData> list = pqScriptCheckDataService.list(new MPJLambdaWrapper<PqScriptCheckData>()
.isNotNull(PqScriptCheckData::getHarmNum) .distinct()
.eq(PqScriptCheckData::getIndex, param.getIndex()) .select(PqScriptCheckData::getHarmNum)
); .eq(PqScriptCheckData::getScriptId, param.getScriptId())
List<Double> harmNum = list.stream().map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList()); .isNotNull(PqScriptCheckData::getHarmNum)
ResultVO resultVO=new ResultVO(); .eq(PqScriptCheckData::getIndex, param.getIndex())
if(CollUtil.isEmpty(harmNum)){ );
harmNum = list.stream().sorted(Comparator.comparing(PqScriptCheckData::getHarmNum))
.map(PqScriptCheckData::getHarmNum).distinct().collect(Collectors.toList());
}
ResultVO resultVO = new ResultVO();
if (CollUtil.isEmpty(harmNum)) {
resultVO.setRawData(adNonHarmonicService.listNonHarmData(storage)); resultVO.setRawData(adNonHarmonicService.listNonHarmData(storage));
resultVO.setResultData(adNonHarmonicService.listNonHarmResultData(storage)); resultVO.setResultData(adNonHarmonicService.listNonHarmResultData(storage));
}else{ } else {
storage.setHarmNum(harmNum); storage.setHarmNum(harmNum);
resultVO.setRawData(adHarmonicService.listHarmData(storage)); resultVO.setRawData(adHarmonicService.listHarmData(storage));
resultVO.setResultData(adHarmonicService.listHarmResultData(storage)); resultVO.setResultData(adHarmonicService.listHarmResultData(storage));