算法执行，更新状态

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

@@ -2,8 +2,10 @@ package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.FaultDiagnosis;
 import org.eco.als.domain.bo.FaultDiagnosisBo;
 import org.eco.als.domain.vo.FaultDiagnosisVo;
 import org.eco.als.service.IFaultDiagnosisService;
@@ -83,8 +85,8 @@ public class FaultDiagnosisController extends BaseController {
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody FaultDiagnosisBo faultDiagnosisBo) {
-        boolean inserted = faultDiagnosisService.insert(faultDiagnosisBo);
-        if (!inserted) {
+        FaultDiagnosis faultDiagnosis = faultDiagnosisService.insert(faultDiagnosisBo);
+        if (ObjectUtil.isEmpty(faultDiagnosis)) {
             return CommonResult.fail("新增故障诊断记录失败！");
         }
         return CommonResult.success();

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

@@ -1,8 +1,10 @@
 package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.PreProcessing;
 import org.eco.als.domain.bo.PreProcessingBo;
 import org.eco.als.domain.vo.PreProcessingVo;
 import org.eco.als.service.IPreProcessingService;
@@ -79,8 +81,8 @@ public class PreProcessingController extends BaseController {
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody PreProcessingBo preProcessingBo) {
-        boolean inserted = preProcessingService.insert(preProcessingBo);
-        if (!inserted) {
+        PreProcessing preProcessing = preProcessingService.insert(preProcessingBo);
+        if (ObjectUtil.isEmpty(preProcessing)) {
             return CommonResult.fail("新增预处理记录失败！");
         }
         return CommonResult.success();

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

@@ -47,7 +47,7 @@ public interface IFaultDiagnosisService extends IBaseService<FaultDiagnosis> {
      * @param faultDiagnosisBo 故障诊断Bo
      * @return 结果:true 操作成功，false 操作失败
      */
-    boolean insert(FaultDiagnosisBo faultDiagnosisBo);
+    FaultDiagnosis insert(FaultDiagnosisBo faultDiagnosisBo);
 
     /**
      * 新增故障诊断，前台提供主键值，一般用于导入的场合

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

@@ -47,7 +47,7 @@ public interface IPreProcessingService extends IBaseService<PreProcessing> {
      * @param preProcessingBo 预处理Bo
      * @return 结果:true 操作成功，false 操作失败
      */
-    boolean insert(PreProcessingBo preProcessingBo);
+    PreProcessing insert(PreProcessingBo preProcessingBo);
 
     /**
      * 新增预处理，前台提供主键值，一般用于导入的场合

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

@@ -1,6 +1,5 @@
 package org.eco.als.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -10,19 +9,13 @@ import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.FalseAlarm;
+import org.eco.als.domain.FaultDiagnosis;
+import org.eco.als.domain.PreProcessing;
 import org.eco.als.domain.Warning;
 import org.eco.als.domain.bo.*;
 import org.eco.als.domain.vo.ModelHttpVo;
 import org.eco.als.domain.vo.ModelVo;
-import org.eco.als.service.IAlgorithmService;
-import org.eco.als.service.IDataImportService;
-import org.eco.als.service.IFalseAlarmResultService;
-import org.eco.als.service.IFalseAlarmService;
-import org.eco.als.service.IFaultDiagnosisService;
-import org.eco.als.service.IModelService;
-import org.eco.als.service.IPreProcessingService;
-import org.eco.als.service.ITaskService;
-import org.eco.als.service.IWarningService;
+import org.eco.als.service.*;
 import org.eco.als.utils.CsvUtils;
 import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.constant.Constants;
@@ -36,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -120,7 +112,7 @@ public class AlgorithmService implements IAlgorithmService {
                 .status("0")
                 .columnData(Arrays.toString(algorithmBo.getColumnData()))
                 .build();
-        processingService.insert(processingBo);
+        PreProcessing preProcessing = processingService.insert(processingBo);
         // 参数
         Map<String, Object> map = StrUtil.isBlank(algorithmBo.getParam()) ? new HashMap<>() : new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
         map.put("url", sysOssVo.getUrl());
@@ -131,6 +123,8 @@ public class AlgorithmService implements IAlgorithmService {
             SysOssVo sysOssVo2 = ossService.upload(resultFile);
             processingBo.setOssId(sysOssVo2.getOssId());
             processingBo.setStatus("1");
+            processingBo.setVersion(preProcessing.getVersion());
+            processingBo.setId(preProcessing.getId());
             processingService.update(processingBo);
         }
         return httpVo != null ? httpVo.getData() : null;
@@ -226,13 +220,15 @@ public class AlgorithmService implements IAlgorithmService {
             .status("0")
             .columnData(Arrays.toString(algorithmBo.getColumnData()))
             .build();
-        faultDiagnosisService.insert(diagnosisBo);
+        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);

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

@@ -107,10 +107,11 @@ public class FaultDiagnosisServiceImpl extends BaseServiceImpl<FaultDiagnosisMap
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
-    public boolean insert(FaultDiagnosisBo faultDiagnosisBo) {
+    public FaultDiagnosis insert(FaultDiagnosisBo faultDiagnosisBo) {
         FaultDiagnosis faultDiagnosis = MapstructUtils.convert(faultDiagnosisBo, FaultDiagnosis.class);
 
-        return this.save(faultDiagnosis);//使用全局配置的雪花算法主键生成器生成ID值
+        this.save(faultDiagnosis);//使用全局配置的雪花算法主键生成器生成ID值
+        return faultDiagnosis;//使用全局配置的雪花算法主键生成器生成ID值
     }
 
     /**

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

@@ -108,10 +108,11 @@ public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMappe
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
-    public boolean insert(PreProcessingBo preProcessingBo) {
+    public PreProcessing insert(PreProcessingBo preProcessingBo) {
         PreProcessing preProcessing = MapstructUtils.convert(preProcessingBo, PreProcessing.class);
 
-        return this.save(preProcessing);//使用全局配置的雪花算法主键生成器生成ID值
+        this.save(preProcessing);//使用全局配置的雪花算法主键生成器生成ID值
+        return preProcessing;//使用全局配置的雪花算法主键生成器生成ID值
     }
 
     /**