icd校验

2025-04-14 13:21:25 +08:00
parent 56dd19b32e
commit 4a2fb595d0
10 changed files with 256 additions and 183 deletions
--- a/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java
+++ b/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java
@@ -219,27 +219,5 @@ public class PqScriptController extends BaseController {
        String checkData = pqScriptDtlsService.getScriptDtlsDesc(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, checkData, methodDescribe);
    }
-
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getCheckInfo1")
-    @ApiOperation("获取脚本与设备校验所需要的信息")
-    public HttpResult<DevPhaseSequenceParam> getIcdCheckInfo1(@RequestBody PreDetectionParam param) {
-        String methodDescribe = getMethodDescribe("getIcdCheckInfo1");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe);
-        DevPhaseSequenceParam result = pqScriptDtlsService.getScriptToDeviceCheckInfo(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getCheckInfo2")
-    @ApiOperation("获取脚本与icd校验所需要的信息")
-    public HttpResult<Map<String, Object>> getIcdCheckInfo2(@RequestBody PreDetectionParam param) {
-        String methodDescribe = getMethodDescribe("getIcdCheckInfo2");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe);
-        Map<String, Object> result = pqScriptDtlsService.getScriptToIcdCheckInfo(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
-
 }

--- a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java
@@ -44,4 +44,12 @@ public interface IPqScriptCheckDataService extends IService<PqScriptCheckData> {
     * @param indexList 脚本下标集合
     */
    List<PqScriptCheckData> listCheckData(String scriptId, List<Integer> indexList);
+
+    /**
+     * 根据脚本id删除数据
+     *
+     * @param ids
+     * @return
+     */
+    boolean deleteByScriptIds(List<String> ids);
 }
--- a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java
@@ -128,19 +128,12 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
    String getScriptDtlsDesc(ScriptParam.Desc param);

    /**
-     * 获取脚本与设备校验所需要的信息
+     * 获取脚本与icd校验所需要的信息
     *
     * @param param
     * @return
     */
-    DevPhaseSequenceParam getScriptToDeviceCheckInfo(PreDetectionParam param);
-
-    /**
-     * 获取脚本与icd校验时所需要的信息
-     *
-     * @return
-     */
-    Map<String, Object> getScriptToIcdCheckInfo(PreDetectionParam param);
+    List<String> getScriptToIcdCheckInfo(PreDetectionParam param);
    /**
     * 根据脚本id获取脚本详情数据
     * @param scriptId 脚本id
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java
@@ -134,5 +134,8 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataM
        return this.list(queryWrapper);
    }

-
+    @Override
+    public boolean deleteByScriptIds(List<String> ids) {
+        return this.remove(new LambdaQueryWrapper<PqScriptCheckData>().in(PqScriptCheckData::getScriptId, ids));
+    }
 }
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -691,8 +691,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
    }

    @Override
-    public DevPhaseSequenceParam getScriptToDeviceCheckInfo(PreDetectionParam param) {
-        Map<String, Object> map = new HashMap<>();
+    public List<String> getScriptToIcdCheckInfo(PreDetectionParam param) {

        PqScriptIssueParam issueParam = new PqScriptIssueParam();
 //        issueParam.setPlanId(param.getPlanId());
@@ -701,44 +700,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
        issueParam.setScriptId(param.getScriptId());
        issueParam.setIsPhaseSequence(SourceOperateCodeEnum.FORMAL_TEST.getValue());
        List<SourceIssue> sourceIssues = this.listSourceIssue(issueParam);
-        sourceIssues = sourceIssues.stream().filter(x -> !DicDataEnum.F.getCode().equals(x.getType()) && !DicDataEnum.VOLTAGE.getCode().equals(x.getType()) && !DicDataEnum.HP.getCode().equals(x.getType())).collect(Collectors.toList());

-        DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam();
        List<String> dataTypeList = new ArrayList<>();
        sourceIssues.forEach(x -> {
            dataTypeList.addAll(x.getDevValueTypeList());
        });
-        phaseSequenceParam.setIgnoreCount(0);
-        phaseSequenceParam.setReadCount(1);
-        phaseSequenceParam.setDataType(dataTypeList);

-        return phaseSequenceParam;
-    }
-
-    @Override
-    public Map<String, Object> getScriptToIcdCheckInfo(PreDetectionParam param) {
-        Map<String, Object> map = new HashMap<>();
-
-        PqScriptIssueParam issueParam = new PqScriptIssueParam();
-//        issueParam.setPlanId(param.getPlanId());
-        issueParam.setSourceId(param.getSourceId());
-        issueParam.setDevIds(param.getDevIds());
-        issueParam.setScriptId(param.getScriptId());
-        issueParam.setIsPhaseSequence(SourceOperateCodeEnum.FORMAL_TEST.getValue());
-        List<SourceIssue> sourceIssues = this.listSourceIssue(issueParam);
-        sourceIssues = sourceIssues.stream().filter(x -> !DicDataEnum.F.getCode().equals(x.getType()) && !DicDataEnum.VOLTAGE.getCode().equals(x.getType()) && !DicDataEnum.HP.getCode().equals(x.getType())).collect(Collectors.toList());
-
-        map.put("scriptList", sourceIssues);
-
-//        List<PqDev> devList = pqDevService.listByIds(param.getDevIds());
-//        // 是否存在多个设备类型?
-//        List<String> devTypeList = devList.stream().map(PqDev::getDevType).distinct().collect(Collectors.toList());
-//        if (devTypeList.size() == 1) {
-//            DevType devType = devTypeService.getById(devTypeList.get(0));
-//            PqIcdPath icd = pqIcdPathService.getIcdByDevType(devType.getId());
-//            map.put("icdName", icd.getName());
-//        }
-        return map;
+        return dataTypeList;
    }

    @Override
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java
@@ -13,6 +13,7 @@ import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.script.mapper.PqScriptMapper;
 import com.njcn.gather.script.pojo.param.PqScriptParam;
 import com.njcn.gather.script.pojo.po.PqScript;
+import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.script.service.IPqScriptService;
 import com.njcn.web.factory.PageFactory;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
 public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> implements IPqScriptService {

    private final IPqScriptDtlsService pqScriptDtlsService;
+    private final IPqScriptCheckDataService pqScriptCheckDataService;

    @Override
    public Page<PqScript> listPqScript(PqScriptParam.QueryParam param) {
@@ -88,6 +90,8 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
        }
        //删除对应的脚本详情
        pqScriptDtlsService.deletePqScriptDtlsByScriptId(ids);
+        //删除对应的checkdata
+        pqScriptCheckDataService.deleteByScriptIds(ids);
        LambdaUpdateWrapper<PqScript> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.set(PqScript::getState, DataStateEnum.DELETED.getCode())
                .in(PqScript::getId, ids);