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

1.调整检测脚本的返回信息

Browse Source 
2.增加误差体系查询接口
This commit is contained in:
wr
2024-12-30 08:37:21 +08:00
parent 39f890dd4c
commit 7f5c132573
9 changed files with 152 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam;
import com.njcn.gather.device.err.pojo.param.PqErrSysParam;
import com.njcn.gather.device.err.pojo.po.PqErrSysDtls;
import com.njcn.gather.device.err.service.IPqErrSysDtlsService;
import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam;
import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
@Override
public List<PqErrSysDtls> listPqErrSysDtlsByPqErrSysId(String pqErrSysId) {
return this.lambdaQuery().eq(PqErrSysDtls::getErrorSysId, pqErrSysId).orderBy(true, true,PqErrSysDtls::getSort).list();
return this.lambdaQuery().eq(PqErrSysDtls::getErrorSysId, pqErrSysId).orderBy(true, true, PqErrSysDtls::getSort).list();
}
@Override
@@ -75,13 +76,16 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
// .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId())
// .in(PqErrSysDtls::getErrorSysId, param.getType())
);
//根据检测脚本id和检测序号，查询出检测子项目
// return this.list(new LambdaQueryWrapper<PqErrSysDtls>()
// PqScriptCheckDataParam script = new PqScriptCheckDataParam();
// script.setScriptId(param.getScriptId());
// script.setIndex(param.getIndex());
// script.setIsValueTypeName(false);
// List<String> valueType = pqScriptCheckDataService.getValueType(script);
// //根据检测脚本id和检测序号，查询出检测子项目
// return this.list(new LambdaQueryWrapper<PqErrSysDtls>()
// .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId())
// .in(PqErrSysDtls::getErrorSysId, param.getType())
// .in(PqErrSysDtls::getScriptType, valueType)
// );
// return new ArrayList<>();
}
}

2
device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java
View File

@@ -14,7 +14,7 @@ public class PqScriptCheckDataParam {
@ApiModelProperty("总检测脚本中的测试项序号")
private Integer index;
@ApiModelProperty("检测指标类型(true:展示名称 ，false展示id ，默认false)")
@ApiModelProperty("检测指标类型(true:code(I$real) ，false展示id ，默认false)")
private Boolean isValueTypeName=false;
}