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-03-08 17:51:22 +08:00
parent 9fcf4e39a4
commit 1075a72375
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,18 +143,16 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
//额定电流信息 //额定电流信息
currSet = devTypes.stream().map(DevType::getDevCurr).collect(Collectors.toSet()); currSet = devTypes.stream().map(DevType::getDevCurr).collect(Collectors.toSet());
} else { } else {
if (ObjectUtil.isNull(param.getType())) { if (param.getType() == 0) {
voltSet.add(1.0); voltSet.add(1.0);
currSet.add(1.0); currSet.add(1.0);
param.setIsPhaseSequence("-1"); param.setIsPhaseSequence("-1");
}else { } else if (param.getType() == 1) {
if (param.getType() == 1) {
voltSet.add(57.74); voltSet.add(57.74);
currSet.add(5.0); currSet.add(5.0);
param.setIsPhaseSequence("-1"); param.setIsPhaseSequence("-1");
} }
} }
}
if (voltSet.size() == 1 && currSet.size() == 1) { if (voltSet.size() == 1 && currSet.size() == 1) {
@@ -831,11 +829,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
//先获取检测脚本类型是否相对值 true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理) //先获取检测脚本类型是否相对值 true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理)
queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId()); queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId());
pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper); pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType())&&param.getType()==1)) { if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType()) && param.getType() == 1)) {
Boolean isValueType; Boolean isValueType;
if (ObjectUtil.isNotNull(param.getValueType()) && param.getValueType() == 2) { if (ObjectUtil.isNotNull(param.getValueType()) && param.getValueType() == 2) {
isValueType = true; //相对值脚本 isValueType = true; //相对值脚本
}else { } else {
isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId()); isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
} }
if (isValueType) { if (isValueType) {