故障诊断

als-modules/agile-assurance/src/main/java/org/eco/als/controller/AlgorithmController.java

@@ -65,9 +65,9 @@ public class AlgorithmController {
      * @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
      **/
     @PostMapping("/execute/fault")
-    public CommonResult<String> executeFault(@Validated @RequestBody AlgorithmBo algorithmBo) {
-        String result = algorithmService.executeFault(algorithmBo);
-        return StrUtil.isBlank(result) ? CommonResult.fail() : CommonResult.success(result, "");
+    public CommonResult<Void> executeFault(@Validated @RequestBody AlgorithmBo algorithmBo) {
+        algorithmService.executeFault(algorithmBo);
+        return CommonResult.success();
     }
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AlgorithmBo.java

@@ -38,6 +38,10 @@ public class AlgorithmBo extends BaseEntity {
      * 机号Id
      */
     private String aircraftId;
+    /**
+     * 机型
+     */
+    private String aircraftType;
 
     /**
      * 架次号

als-modules/agile-assurance/src/main/java/org/eco/als/service/IAlgorithmService.java

@@ -16,7 +16,7 @@ public interface IAlgorithmService {
 
     String executeFalseAlarm(AlgorithmBo algorithmBo);
 
-    String executeFault(AlgorithmBo algorithmBo);
+    void executeFault(AlgorithmBo algorithmBo);
     String executeEvaluation(AlgorithmBo algorithmBo);
 
     String batchExecute(TaskBo taskBo);

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java

@@ -206,57 +206,58 @@ public class AlgorithmService implements IAlgorithmService {
      * executeFault 故障诊断
      *
      * @param algorithmBo 参数
-     * @return java.lang.String
      **/
 
     @Override
     @Transactional
-    public String executeFault(AlgorithmBo algorithmBo) {
+    public void executeFault(AlgorithmBo algorithmBo) {
         ModelBo modelBo = new ModelBo();
-        modelBo.setPartId(algorithmBo.getPartId());
+        modelBo.setAircraftType(algorithmBo.getAircraftType());
         modelBo.setType("5");
         List<ModelVo> list = modelService.selectList(modelBo);
         if (CollUtil.isEmpty(list)) {
             throw new BusinessException("模型信息为空，请检查！");
         }
-        // 模型相关信息
-        ModelVo modelVo = list.getFirst();
-        algorithmBo.setColumnData(modelVo.getColumnData().split(","));
-        SysOssVo sysOssVo = getSysOssVo(algorithmBo);
-        if (sysOssVo == null) {
-            return null;
-        }
-        FaultDiagnosisBo diagnosisBo = FaultDiagnosisBo.builder()
-            .ossId(sysOssVo.getOssId())
-            .aircraftId(algorithmBo.getAircraftId())
-            .modelType(modelVo.getType())
-            .sortieNo(algorithmBo.getSortieNo())
-            .param(algorithmBo.getPartId())
-            .status("0")
-            .columnData(Arrays.toString(algorithmBo.getColumnData()))
-            .build();
-        FaultDiagnosis faultDiagnosis = faultDiagnosisService.insert(diagnosisBo);
-        // 参数
-        Map<String, Object> map = StrUtil.isBlank(algorithmBo.getParam()) ? new HashMap<>() : new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
-        map.put("url", sysOssVo.getUrl());
-        // 请求
-        ModelHttpVo httpVo = sendHttp(modelVo, map);
-        if (httpVo != null && httpVo.getStatus() == 200) {
-            diagnosisBo.setId(faultDiagnosis.getId());
-            diagnosisBo.setVersion(faultDiagnosis.getVersion());
-            diagnosisBo.setStatus("1");
-            diagnosisBo.setResultContent(httpVo.getData());
-            faultDiagnosisService.update(diagnosisBo);
-            FaultDiagnosisResultBo resultBo = FaultDiagnosisResultBo.builder()
-                .diagnosisId(diagnosisBo.getId())
-                .aircraftId(diagnosisBo.getAircraftId())
-                .diagnosisId(diagnosisBo.getId())
-                .resultContent(httpVo.getData())
-                .sortieNo(diagnosisBo.getSortieNo())
+        list.forEach(modelVo -> {
+            algorithmBo.setColumnData(modelVo.getColumnData().split(","));
+            SysOssVo sysOssVo = getSysOssVo(algorithmBo);
+            if (sysOssVo == null) {
+                throw new BusinessException("架次数据为空，请检查！");
+            }
+            FaultDiagnosisBo diagnosisBo = FaultDiagnosisBo.builder()
+                .ossId(sysOssVo.getOssId())
+                .aircraftId(algorithmBo.getAircraftId())
+                .modelType(modelVo.getType())
+                .sortieNo(algorithmBo.getSortieNo())
+                .param(algorithmBo.getPartId())
+                .status("0")
+                .columnData(Arrays.toString(algorithmBo.getColumnData()))
                 .build();
-            faultDiagnosisResultService.insert(resultBo);
-        }
-        return httpVo != null ? httpVo.getData() : null;
+            FaultDiagnosis faultDiagnosis = faultDiagnosisService.insert(diagnosisBo);
+            // 参数
+            Map<String, Object> map = StrUtil.isBlank(algorithmBo.getParam()) ? new HashMap<>() : new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
+            map.put("url", sysOssVo.getUrl());
+            // 请求
+            ModelHttpVo httpVo = sendHttp(modelVo, map);
+            if (httpVo != null && httpVo.getStatus() == 200) {
+                diagnosisBo.setId(faultDiagnosis.getId());
+                diagnosisBo.setVersion(faultDiagnosis.getVersion());
+                diagnosisBo.setStatus("1");
+                diagnosisBo.setResultContent(httpVo.getData());
+                faultDiagnosisService.update(diagnosisBo);
+                FaultDiagnosisResultBo resultBo = FaultDiagnosisResultBo.builder()
+                    .diagnosisId(diagnosisBo.getId())
+                    .aircraftId(diagnosisBo.getAircraftId())
+                    .diagnosisId(diagnosisBo.getId())
+                    .resultContent(httpVo.getData())
+                    .sortieNo(diagnosisBo.getSortieNo())
+                    .param(algorithmBo.getPartId())
+                    .columnData(modelVo.getColumnData())
+                    .remarks(modelVo.getParamType())
+                    .build();
+                faultDiagnosisResultService.insert(resultBo);
+            }
+        });
     }
 
     @Override