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-10 18:38:41 +08:00
parent 1b518e508e
commit 77e2a73345
11 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/script/pojo/constant/PqScriptValidMessage.java
View File

@@ -7,5 +7,5 @@ package com.njcn.gather.script.pojo.constant;
public interface PqScriptValidMessage {
String INDEX_NOT_NULL = "index不能为空";
String VALUE_TYPE_NOT_NULL = "脚本值类型不能为空";
String VALUE_TYPE_NOT_BLANK = "脚本值类型不能为空";
}

4
detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java
View File

@@ -39,8 +39,4 @@ public class PqScriptIssueParam {
@ApiModelProperty("脚本下发类型")
private int type;
@ApiModelProperty("脚本值类型")
private int valueType;
}

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

@@ -830,12 +830,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId());
pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType()) && param.getType() == 1)) {
Boolean isValueType;
if (ObjectUtil.isNotNull(param.getValueType()) && param.getValueType() == 2) {
isValueType = true; //相对值脚本
} else {
isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
}
Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
if (isValueType) {
for (PqScriptDtls pqScriptDtl : pqScriptDtls) {
if (VOL.equals(pqScriptDtl.getValueType())) {