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

不合格项复检bug

Browse Source
This commit is contained in:
caozehui
2025-05-09 08:51:14 +08:00
parent 9438301ebd
commit 40b0e535cb
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -844,10 +844,14 @@ public class SocketDevResponseService {
if (param.getOperateType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) { if (param.getOperateType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) {
//不合格项复检 //不合格项复检
List<Integer> indexes = new ArrayList<>();
StorageParam storageParam = new StorageParam(); StorageParam storageParam = new StorageParam();
storageParam.setCode(param.getCode()); storageParam.setCode(param.getCode());
storageParam.setScriptId(param.getScriptId()); storageParam.setScriptId(param.getScriptId());
List<Integer> indexes = adHarmonicService.getIndex(storageParam, true); param.getDevIds().forEach(devId -> {
storageParam.setDevId(devId);
indexes.addAll(adHarmonicService.getIndex(storageParam, true));
});
issueParam.setIndexList(indexes); issueParam.setIndexList(indexes);
issueParam.setIsPhaseSequence(SourceOperateCodeEnum.RE_ERROR_TEST.getValue()); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.RE_ERROR_TEST.getValue());
} else { } else {
@@ -909,7 +913,7 @@ public class SocketDevResponseService {
} else { } else {
// 发送下一个脚本与icd校验 // 发送下一个脚本与icd校验
String icdType = icdTypeList.stream().filter(it -> !icdCheckDataMap.containsKey(it)).findFirst().orElse(null); String icdType = icdTypeList.stream().filter(it -> !icdCheckDataMap.containsKey(it)).findFirst().orElse(null);
if(ObjectUtil.isNotNull(icdType)){ if (ObjectUtil.isNotNull(icdType)) {
Map<String, Object> map = new HashMap<>(2); Map<String, Object> map = new HashMap<>(2);
map.put("dataType", dataTypeList); map.put("dataType", dataTypeList);
map.put("icdType", icdType); map.put("icdType", icdType);
@@ -1623,8 +1627,8 @@ public class SocketDevResponseService {
initXiManager(param); initXiManager(param);
} }
harmonicRelationMap.put(DetectionCodeEnum.V2_50.getCode(),DetectionCodeEnum.U1.getCode()); harmonicRelationMap.put(DetectionCodeEnum.V2_50.getCode(), DetectionCodeEnum.U1.getCode());
harmonicRelationMap.put(DetectionCodeEnum.I2_50.getCode(),DetectionCodeEnum.I1.getCode()); harmonicRelationMap.put(DetectionCodeEnum.I2_50.getCode(), DetectionCodeEnum.I1.getCode());
} }
//初始化系数校验参数 //初始化系数校验参数
@@ -1728,7 +1732,7 @@ public class SocketDevResponseService {
} }
} else { } else {
for(int j=0;j<data.getSqlDataHarm().size();j++){ for (int j = 0; j < data.getSqlDataHarm().size(); j++) {
DevData.SqlDataHarmDTO sqlDataDTO = data.getSqlDataHarm().get(j); DevData.SqlDataHarmDTO sqlDataDTO = data.getSqlDataHarm().get(j);
String dui = harmonicRelationMap.get(sqlDataDTO.getDesc()); String dui = harmonicRelationMap.get(sqlDataDTO.getDesc());
AdHarmonicResult adHarmonicResult = new AdHarmonicResult(); AdHarmonicResult adHarmonicResult = new AdHarmonicResult();
@@ -1742,7 +1746,7 @@ public class SocketDevResponseService {
if (!DicDataEnum.HSV.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HSI.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HP.getCode().equals(sourceIssue.getType())) { if (!DicDataEnum.HSV.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HSI.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HP.getCode().equals(sourceIssue.getType())) {
if (CollUtil.isNotEmpty(data.getSqlData())) { if (CollUtil.isNotEmpty(data.getSqlData())) {
DevData.SqlDataDTO.ListDTO vvv = data.getSqlData().stream().filter(it->it.getDesc().equals(dui)).collect(Collectors.toList()).get(0).getList(); DevData.SqlDataDTO.ListDTO vvv = data.getSqlData().stream().filter(it -> it.getDesc().equals(dui)).collect(Collectors.toList()).get(0).getList();
Double aV = vvv.getA(); Double aV = vvv.getA();
Double bV = vvv.getB(); Double bV = vvv.getB();
Double cV = vvv.getC(); Double cV = vvv.getC();

2
detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
View File

@@ -155,7 +155,7 @@ public class AdPlanController extends BaseController {
public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) { public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
String methodDescribe = getMethodDescribe("getBigTestItem"); String methodDescribe = getMethodDescribe("getBigTestItem");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevId()); List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevIds());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }

2
detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java
View File

@@ -110,6 +110,6 @@ public class AdPlanParam {
// 0:不合格项复检 1:全部复检 // 0:不合格项复检 1:全部复检
private Integer reCheckType; private Integer reCheckType;
private String planId; private String planId;
private String devId; private List<String> devIds;
} }
} }

4
detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
View File

@@ -70,10 +70,10 @@ public interface IAdPlanService extends IService<AdPlan> {
* *
* @param reCheckType 0:不合格项复检 1:全部复检 * @param reCheckType 0:不合格项复检 1:全部复检
* @param planId 检测计划Id * @param planId 检测计划Id
* @param devId 设备Id * @param devIds 设备Id列表
* @return * @return
*/ */
List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, String devId); List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds);
/** /**
* 修改计划状态 * 修改计划状态

10
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -308,7 +308,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} }
@Override @Override
public List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, String devId) { public List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, List<String> devIds) {
List<Map<String, String>> result = new ArrayList<>(); List<Map<String, String>> result = new ArrayList<>();
AdPlan adPlan = this.getById(planId); AdPlan adPlan = this.getById(planId);
if (ObjectUtil.isNull(adPlan)) { if (ObjectUtil.isNull(adPlan)) {
@@ -330,11 +330,15 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
// //
// scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList());
// } // }
List<Integer> indexes = new ArrayList<>();
StorageParam storageParam = new StorageParam(); StorageParam storageParam = new StorageParam();
storageParam.setDevId(devId);
storageParam.setCode(adPlan.getCode() + ""); storageParam.setCode(adPlan.getCode() + "");
storageParam.setScriptId(adPlan.getScriptId()); storageParam.setScriptId(adPlan.getScriptId());
List<Integer> indexes = adHarmonicService.getIndex(storageParam, true); devIds.forEach(devId -> {
storageParam.setDevId(devId);
indexes.addAll(adHarmonicService.getIndex(storageParam, true));
});
scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList());
} }