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

代码调整

Browse Source
This commit is contained in:
chendaofei
2025-01-03 13:21:45 +08:00
parent 5c8a4fbfb8
commit 82acf16593
10 changed files with 217 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,8 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataMapper, PqScriptCheckData> implements IPqScriptCheckDataService {
private final String V="V2-50$real";
private final String SV="SV_1-49$real";
private final String I="I2-50$real";
private final String IV="SI_1-49$real";
private final String V="real$V2-50";
private final String SV="real$SV_1-49";
@Override
public List<String> getValueType(PqScriptCheckDataParam param) {
@@ -49,10 +47,7 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataM
if (param.getIsValueTypeName()) {
List<String> checkData = pqScriptCheckData.stream().map(x -> x.getDataType() + "$" + x.getValueType()).distinct().collect(Collectors.toList());
if(checkData.contains(V)||checkData.contains(SV)){
checkData.add("U1$real");
}
if(checkData.contains(I)||checkData.contains(IV)){
checkData.add("I1$real");
checkData.add("real$U1");
}
return checkData;
} else {

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

@@ -212,7 +212,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(PqScriptDtls.class)
.selectAs(DictTree::getCode, PqScriptDtls::getScriptCode)
.leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType);
.leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType)
.eq(PqScriptDtls::getEnable, 1);;
if (isPhaseSequence) {
queryWrapper.eq(PqScriptDtls::getIndex, -1)
.eq(PqScriptDtls::getEnable, 1);