feat: 一键任务管理 POJO修改

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

@@ -49,6 +49,7 @@ public class AlgorithmController {
     public CommonResult<String> executeFault(@Validated @RequestBody AlgorithmBo algorithmBo) {
         return StrUtil.isBlank(algorithmService.executeFalseAlarm(algorithmBo)) ? CommonResult.fail() : CommonResult.success();
     }
+
     @SaCheckPermission("als:algorithm:execute")
     @Log(title = "执行任务", businessType = BusinessType.EXECUTE)
     @PostMapping("/execute/task")

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

@@ -36,7 +36,7 @@ public class CarryChecklist extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
+    private Long aircraftId;
 
     /**
      * 成品名称

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

@@ -36,8 +36,7 @@ public class FalseAlarm extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 状态
      */

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

@@ -41,8 +41,7 @@ public class FalseAlarmResult extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 警告代码
      */

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

@@ -36,7 +36,7 @@ public class FaultDiagnosis extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
+    private Long aircraftId;
 
     /**
      * 状态（1正常）

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

@@ -41,8 +41,7 @@ public class FaultDiagnosisResult extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 状态（1正常）
      */

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

@@ -42,8 +42,7 @@ public class FlightTask extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 起飞时间
      */

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

@@ -31,8 +31,7 @@ public class LifePrediction extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 部件名称
      */

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

@@ -36,8 +36,7 @@ public class LifePredictionResult extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 部件名称
      */

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

@@ -36,8 +36,7 @@ public class MaintenanceDecision extends BaseEntity {
     /**
      * 机号
      */
-    private Integer aircraftNo;
-
+    private Long aircraftId;
     /**
      * 诊断结果
      */

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

@@ -37,8 +37,7 @@ public class MaintenanceRecord extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 出厂号码
      */

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

@@ -37,8 +37,7 @@ public class MaintenanceTask extends BaseEntity {
     /**
      * 机号
      */
-    private Integer aircraftNo;
-
+    private Long aircraftId;
     /**
      * 所属系统
      */

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

@@ -36,13 +36,33 @@ public class PreProcessing extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
+    private Long aircraftId;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    private String param;
+
+    /**
+     * 数据列
+     */
+    private String columnData;
 
     /**
      * 文件Id
      */
     private Long ossId;
 
+    /**
+     * 结果
+     */
+    private Long result;
+
     /**
      * 状态
      */

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

@@ -32,8 +32,7 @@ public class SmTask extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 机型
      */

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

@@ -32,8 +32,7 @@ public class SmTaskRecord extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 机型
      */

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

@@ -32,8 +32,7 @@ public class SmTaskSub extends BaseEntity {
     /**
      * 机号
      */
-    private String aircraftNo;
-
+    private Long aircraftId;
     /**
      * 机型
      */

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

@@ -19,9 +19,9 @@ import java.io.Serial;
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_task_t")
 public class Task extends BaseEntity {
+
     @Serial
     private static final long serialVersionUID = 1L;
-
     /**
      * 任务编号
      */
@@ -53,6 +53,26 @@ public class Task extends BaseEntity {
      */
     private Long dataId;
 
+    /**
+     * 预处理编号
+     */
+    private Long preId;
+
+    /**
+     * 虚警编号
+     */
+    private Long falseAlarmId;
+
+    /**
+     * 故障诊断编号
+     */
+    private Long faultId;
+
+    /**
+     * 决策编号
+     */
+    private Long decisionId;
+
     /**
      * 状态（1正常）
      */

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

@@ -36,8 +36,7 @@ public class Warning extends BaseEntity {
     /**
      * 机号
      */
-    private Integer aircraftNo;
-
+    private Long aircraftId;
     /**
      * 警告代码
      */

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

@@ -30,10 +30,10 @@ public class CarryChecklistBo extends BaseEntity {
     private String aircraftModel;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 成品名称

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

@@ -2,6 +2,7 @@ package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.FalseAlarm;
@@ -29,10 +30,10 @@ public class FalseAlarmBo extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 状态

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

@@ -36,10 +36,10 @@ public class FalseAlarmResultBo extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 警告代码

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

@@ -2,6 +2,8 @@ package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.FaultDiagnosis;
@@ -14,6 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
  * @date 2024-07-23
  */
 @Data
+@Builder
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = FaultDiagnosis.class, reverseConvertGenerate = false)
 public class FaultDiagnosisBo extends BaseEntity {
@@ -29,15 +32,14 @@ public class FaultDiagnosisBo extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 状态（1正常）
      */
-    @NotBlank(message = "状态（1正常）不能为空")
     private String status;
 
 

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

@@ -36,10 +36,10 @@ public class FaultDiagnosisResultBo extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 状态（1正常）

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

@@ -40,10 +40,10 @@ public class FlightTaskBo extends BaseEntity {
     private String aircraftModel;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 起飞时间

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

@@ -2,6 +2,7 @@ package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.LifePrediction;
@@ -23,10 +24,10 @@ public class LifePredictionBo extends BaseEntity {
     private Long id;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 部件名称

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

@@ -30,10 +30,10 @@ public class LifePredictionResultBo extends BaseEntity {
     private Long lifeId;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 部件名称

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

@@ -30,10 +30,10 @@ public class MaintenanceDecisionBo extends BaseEntity {
     private Long sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
     @NotNull(message = "机号不能为空")
-    private Integer aircraftNo;
+    private Long aircraftId;
 
     /**
      * 故障代码

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

@@ -3,6 +3,7 @@ package org.eco.als.domain.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.MaintenanceRecord;
@@ -32,10 +33,10 @@ public class MaintenanceRecordBo extends BaseEntity {
     private String aircraftType;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 出厂号码

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

@@ -33,10 +33,10 @@ public class MaintenanceTaskBo extends BaseEntity {
     private Long sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
     @NotNull(message = "机号不能为空")
-    private Integer aircraftNo;
+    private Long aircraftId;
 
     /**
      * 所属系统

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

@@ -3,6 +3,7 @@ package org.eco.als.domain.bo;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -19,6 +20,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @AutoMapper(target = PreProcessing.class, reverseConvertGenerate = false)
+@Builder
 public class PreProcessingBo extends BaseEntity {
     /**
      * 编号
@@ -32,22 +34,41 @@ public class PreProcessingBo extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
+
+    /**
+     * 模型类型
+     */
+    @NotBlank(message = "模型类型不能为空")
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    @NotBlank(message = "参数不能为空")
+    private String param;
+
+    /**
+     * 数据列
+     */
+    @NotBlank(message = "数据列不能为空")
+    private String columnData;
 
     /**
      * 文件Id
      */
-    @NotNull(message = "文件Id不能为空")
     private Long ossId;
 
+    /**
+     * 结果
+     */
+    private Long result;
+
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空")
     private String status;
-
-
 }

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

@@ -27,10 +27,10 @@ public class SmTaskBo extends BaseEntity {
     private Long id;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 机型

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

@@ -3,6 +3,7 @@ package org.eco.als.domain.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.SmTaskRecord;
@@ -26,10 +27,10 @@ public class SmTaskRecordBo extends BaseEntity {
     private Long id;
 
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 机型

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

@@ -3,6 +3,7 @@ package org.eco.als.domain.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.SmTaskSub;
@@ -26,10 +27,10 @@ public class SmTaskSubBo extends BaseEntity {
      */
     private Long id;
     /**
-     * 机号
+     * 机号Id
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 机型

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

@@ -2,6 +2,7 @@ package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.Task;
@@ -41,8 +42,9 @@ public class TaskBo extends BaseEntity {
     private Long sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
+    @NotNull(message = "机号不能为空")
     private Long aircraftId;
 
     /**
@@ -50,6 +52,34 @@ public class TaskBo extends BaseEntity {
      */
     private Long dataId;
 
+    /**
+     * 预处理编号
+     */
+    private Long preId;
+
+    /**
+     * 虚警编号
+     */
+    private Long falseAlarmId;
+
+    /**
+     * 故障诊断编号
+     */
+    private Long faultId;
+
+    /**
+     * 决策编号
+     */
+    private Long decisionId;
+
+    /**
+     * 步骤号
+     */
+    private Long stepNumber;
+
+    /**
+     * 算法信息
+     */
     private List<AlgorithmBo> algorithmList;
 
 

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

@@ -30,10 +30,10 @@ public class WarningBo extends BaseEntity {
     private Long sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
     @NotNull(message = "机号不能为空")
-    private Integer aircraftNo;
+    private Long aircraftId;
 
     /**
      * 警告代码

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/CarryChecklistImportVo.java

@@ -2,6 +2,8 @@ package org.eco.als.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.eco.common.mapper.annotation.FieldMapper;
+import com.eco.common.mapper.constant.MapperConstant;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/CarryChecklistVo.java

@@ -40,10 +40,16 @@ public class CarryChecklistVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "机型")
     private String aircraftModel;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FalseAlarmResultVo.java

@@ -48,10 +48,16 @@ public class FalseAlarmResultVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FalseAlarmVo.java

@@ -42,10 +42,16 @@ public class FalseAlarmVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultDiagnosisResultVo.java

@@ -48,10 +48,16 @@ public class FaultDiagnosisResultVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FaultDiagnosisVo.java

@@ -40,10 +40,16 @@ public class FaultDiagnosisVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
+    /**
+     * 机号
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**
@@ -55,7 +61,6 @@ public class FaultDiagnosisVo extends BaseEntity implements Serializable {
     /**
      * 删除标识（1删除 0未删除）
      */
-    @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
 

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/FlightTaskVo.java

@@ -47,10 +47,16 @@ public class FlightTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "机型")
     private String aircraftModel;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/LifePredictionResultVo.java

@@ -42,10 +42,16 @@ public class LifePredictionResultVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "寿命预测编号")
     private Long lifeId;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/LifePredictionVo.java

@@ -36,10 +36,16 @@ public class LifePredictionVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "编号")
     private Long id;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceDecisionVo.java

@@ -40,11 +40,17 @@ public class MaintenanceDecisionVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private Long sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
-    private Integer aircraftNo;
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
+    private String aircraftNo;
 
     /**
      * 诊断结果

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceRecordVo.java

@@ -41,10 +41,16 @@ public class MaintenanceRecordVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "机型")
     private String aircraftType;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/MaintenanceTaskVo.java

@@ -43,11 +43,17 @@ public class MaintenanceTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private Long sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
-    private Integer aircraftNo;
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
+    private String aircraftNo;
 
     /**
      * 所属系统

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/PreProcessingVo.java

@@ -42,10 +42,16 @@ public class PreProcessingVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**
@@ -54,6 +60,31 @@ public class PreProcessingVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "文件Id")
     private Long ossId;
 
+    /**
+     * 模型类型
+     */
+    @ExcelProperty(value = "模型类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "common_type")
+    private String modelType;
+
+    /**
+     * 参数
+     */
+    @ExcelProperty(value = "参数")
+    private String param;
+
+    /**
+     * 数据列
+     */
+    @ExcelProperty(value = "数据列")
+    private String columnData;
+
+    /**
+     * 结果
+     */
+    @ExcelProperty(value = "结果")
+    private Long result;
+
     /**
      * 状态
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SmTaskRecordVo.java

@@ -37,10 +37,16 @@ public class SmTaskRecordVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "编号")
     private Long id;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SmTaskSubVo.java

@@ -37,10 +37,16 @@ public class SmTaskSubVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "编号")
     private Long id;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SmTaskVo.java

@@ -37,10 +37,16 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "编号")
     private Long id;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/TaskVo.java

@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.Task;
+import org.eco.common.excel.annotation.ExcelDictFormat;
+import org.eco.common.excel.convert.ExcelDictConvert;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
@@ -43,7 +45,8 @@ public class TaskVo extends BaseEntity implements Serializable {
     /**
      * 数据源
      */
-    @ExcelProperty(value = "数据源")
+    @ExcelProperty(value = "数据源", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "common_type")
     private String source;
 
     /**
@@ -64,6 +67,30 @@ public class TaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "数据编号")
     private Long dataId;
 
+    /**
+     * 预处理编号
+     */
+    @ExcelProperty(value = "预处理编号")
+    private Long preId;
+
+    /**
+     * 虚警编号
+     */
+    @ExcelProperty(value = "虚警编号")
+    private Long falseAlarmId;
+
+    /**
+     * 故障诊断编号
+     */
+    @ExcelProperty(value = "故障诊断编号")
+    private Long faultId;
+
+    /**
+     * 决策编号
+     */
+    @ExcelProperty(value = "决策编号")
+    private Long decisionId;
+
     /**
      * 状态（1正常）
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/WarningVo.java

@@ -42,11 +42,17 @@ public class WarningVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private Long sortieNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
-    private Integer aircraftNo;
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
+    private String aircraftNo;
 
     /**
      * 警告代码

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

@@ -12,68 +12,67 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 /**
- * 任务管理Service接口
+ * 任务信息Service接口
  *
  * @author wgk
  * @date 2024-08-07
  */
 public interface ITaskService extends IBaseService<Task> {
     /**
-     * 查询任务管理
+     * 查询任务信息
      *
-     * @param id 任务管理主键
-     * @return 任务管理
+     * @param id 任务信息主键
+     * @return 任务信息
      */
     TaskVo selectById(Long id);
 
     /**
-     * 查询任务管理列表
+     * 查询任务信息列表
      *
-     * @param taskBo 任务管理Bo
-     * @return 任务管理集合
+     * @param taskBo 任务信息Bo
+     * @return 任务信息集合
      */
     List<TaskVo> selectList(TaskBo taskBo);
 
     /**
-     * 分页查询任务管理列表
+     * 分页查询任务信息列表
      *
-     * @param taskBo 任务管理Bo
-     * @return 分页任务管理集合
+     * @param taskBo 任务信息Bo
+     * @return 分页任务信息集合
      */
     PageResult<TaskVo> selectPage(TaskBo taskBo);
 
     /**
-     * 新增任务管理
+     * 新增任务信息
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 操作成功，false 操作失败
      */
     boolean insert(TaskBo taskBo);
 
     /**
-     * 新增任务管理，前台提供主键值，一般用于导入的场合
+     * 新增任务信息，前台提供主键值，一般用于导入的场合
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 操作成功，false 操作失败
      */
     boolean insertWithPk(TaskBo taskBo);
 
     /**
-     * 修改任务管理
+     * 修改任务信息
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 更新成功，false 更新失败
      */
     boolean update(TaskBo taskBo);
 
     /**
-     * 批量删除任务管理
+     * 批量删除任务信息
      *
-     * @param ids 需要删除的任务管理主键集合
+     * @param ids 需要删除的任务信息主键集合
      * @return 结果:true 删除成功，false 删除失败
      */
     boolean deleteByIds(Long[] ids);
-
     /**
      * asyncExport 异步导出
      *

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

@@ -7,6 +7,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.Warning;
 import org.eco.als.domain.bo.AlgorithmBo;
+import org.eco.als.domain.bo.FaultDiagnosisBo;
 import org.eco.als.domain.bo.PreProcessingBo;
 import org.eco.als.domain.bo.TaskBo;
 import org.eco.als.domain.vo.DataImportVo;
@@ -14,8 +15,11 @@ 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.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.utils.CsvUtils;
 import org.eco.common.core.exception.BusinessException;
@@ -54,6 +58,15 @@ public class AlgorithmService implements IAlgorithmService {
     @Resource
     private IWarningService warningService;
 
+    @Resource
+    private IFalseAlarmService falseAlarmService;
+
+    @Resource
+    private IFaultDiagnosisService faultDiagnosisService;
+
+    @Resource
+    private ITaskService taskService;
+
     /**
      * executePro 预处理
      *
@@ -76,29 +89,26 @@ public class AlgorithmService implements IAlgorithmService {
         }
 
         // 参数
-        String param = algorithmBo.getParam();
-        Map<String, Object> map = new HashMap<>(JSONUtil.parseObj(param));
+        Map<String, Object> map = new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
+        File file = null;
         try (InputStream inputStream = ossService.getFileStream(dataVo.getOssId())) {
-            File file = CsvUtils.excelToFileCsvByColumns(inputStream, algorithmBo.getColumnData());
-            SysOssVo sysOssVo1 = ossService.upload(file);
-            // 请求
-            map.put("url", sysOssVo1.getUrl());
-            ModelHttpVo httpVo = sendHttp(modelVo, map);
-            PreProcessingBo bo = new PreProcessingBo();
-            if (httpVo != null && httpVo.getStatus() == 200) {
-                File resultFile = CsvUtils.jsonToFileCsv(httpVo.getData(), CsvUtils.extractFilename("model_result"));
-                SysOssVo sysOssVo2 = ossService.upload(resultFile);
-                bo.setOssId(sysOssVo2.getOssId());
-            } else {
-                bo.setStatus("0");
-            }
-            bo.setAircraftNo(dataVo.getAircraftNo()).setSortieNo(dataVo.getSortieNo());
-            processingService.insert(bo);
-            return httpVo != null ? httpVo.getData() : null;
+            file = CsvUtils.excelToFileCsvByColumns(inputStream, algorithmBo.getColumnData());
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("文件转换异常：{}", e.getMessage());
         }
-        return null;
+        if (ObjectUtil.isNull(file)) {
+            return null;
+        }
+        SysOssVo sysOssVo = ossService.upload(file);
+        processingService.insert(PreProcessingBo.builder().ossId(sysOssVo.getOssId()).aircraftId(dataVo.getAircraftId()).sortieNo(dataVo.getSortieNo()).build());
+        // 请求
+        map.put("url", sysOssVo.getUrl());
+        ModelHttpVo httpVo = sendHttp(modelVo, map);
+        if (httpVo != null && httpVo.getStatus() == 200) {
+            File resultFile = CsvUtils.jsonToFileCsv(httpVo.getData(), CsvUtils.extractFilename("model_result"));
+            SysOssVo sysOssVo2 = ossService.upload(resultFile);
+        }
+        return httpVo != null ? httpVo.getData() : null;
     }
 
     /**
@@ -121,15 +131,10 @@ public class AlgorithmService implements IAlgorithmService {
         }
         // 警告列表
         List<Warning> warnings = warningService.listByIds(Arrays.asList(algorithmBo.getWarningIds()));
-
         warnings.forEach(el -> {
 
         });
 
-
-
-
-
         // 数据相关信息
         DataImportVo dataVo = dataImportService.selectById(algorithmBo.getDataId());
         if (ObjectUtil.isNull(dataVo)) {
@@ -144,16 +149,10 @@ public class AlgorithmService implements IAlgorithmService {
             // 请求
             map.put("url", sysOssVo1.getUrl());
             ModelHttpVo httpVo = sendHttp(modelVo, map);
-            PreProcessingBo bo = new PreProcessingBo();
             if (httpVo != null && httpVo.getStatus() == 200) {
                 File resultFile = CsvUtils.jsonToFileCsv(httpVo.getData(), CsvUtils.extractFilename("model_result"));
                 SysOssVo sysOssVo2 = ossService.upload(resultFile);
-                bo.setOssId(sysOssVo2.getOssId());
-            } else {
-                bo.setStatus("0");
             }
-            bo.setAircraftNo(dataVo.getAircraftNo()).setSortieNo(dataVo.getSortieNo());
-            processingService.insert(bo);
             return httpVo != null ? httpVo.getData() : null;
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -190,16 +189,10 @@ public class AlgorithmService implements IAlgorithmService {
             // 请求
             map.put("url", sysOssVo1.getUrl());
             ModelHttpVo httpVo = sendHttp(modelVo, map);
-            PreProcessingBo bo = new PreProcessingBo();
             if (httpVo != null && httpVo.getStatus() == 200) {
-                File resultFile = CsvUtils.jsonToFileCsv(httpVo.getData(), CsvUtils.extractFilename("model_result"));
-                SysOssVo sysOssVo2 = ossService.upload(resultFile);
-                bo.setOssId(sysOssVo2.getOssId());
+                faultDiagnosisService.insert(FaultDiagnosisBo.builder().aircraftId(dataVo.getAircraftId()).build());
             } else {
-                bo.setStatus("0");
             }
-            bo.setAircraftNo(dataVo.getAircraftNo()).setSortieNo(dataVo.getSortieNo());
-            processingService.insert(bo);
             return httpVo != null ? httpVo.getData() : null;
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -209,11 +202,43 @@ public class AlgorithmService implements IAlgorithmService {
 
     @Override
     public String batchExecute(TaskBo taskBo) {
+        // 数据编号
+        Long dataId;
+        // 预处理编号
+        Long preId;
+        // 虚警编号
+        Long falseAlarmId;
+        // 故障诊断编号
+        Long faultId;
+        // 决策编号
+        Long decisionId;
         List<AlgorithmBo> algorithmList = taskBo.getAlgorithmList();
         // 批量执行
         algorithmList.forEach(el -> {
-
+            // 模型相关信息
+            ModelVo modelVo = modelService.selectById(el.getModelId());
+            // 数据相关信息
+            DataImportVo dataVo = dataImportService.selectById(el.getDataId());
+            // 参数
+            Map<String, Object> map = new HashMap<>(JSONUtil.parseObj(el.getParam()));
+            try (InputStream inputStream = ossService.getFileStream(dataVo.getOssId())) {
+                File file = CsvUtils.excelToFileCsvByColumns(inputStream, el.getColumnData());
+                SysOssVo sysOssVo = ossService.upload(file);
+                // 请求
+                map.put("url", sysOssVo.getUrl());
+                ModelHttpVo httpVo = sendHttp(modelVo, map);
+                if (httpVo != null && httpVo.getStatus() == 200) {
+                    File resultFile = CsvUtils.jsonToFileCsv(httpVo.getData(), CsvUtils.extractFilename("model_result"));
+                    SysOssVo sysOssVo2 = ossService.upload(resultFile);
+                }
+                if (taskBo.getStepNumber() == 1) {
+                    // TODO 对应结果
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
         });
+        taskService.insert(taskBo);
         return null;
     }
 

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

@@ -57,8 +57,8 @@ public class CarryChecklistServiceImpl extends BaseServiceImpl<CarryChecklistMap
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(CARRY_CHECKLIST.AIRCRAFT_MODEL.eq
             (carryChecklistBo.getAircraftModel()));
-        queryWrapper.and(CARRY_CHECKLIST.AIRCRAFT_NO.eq
-            (carryChecklistBo.getAircraftNo()));
+        queryWrapper.and(CARRY_CHECKLIST.AIRCRAFT_ID.eq
+            (carryChecklistBo.getAircraftId()));
         queryWrapper.and(CARRY_CHECKLIST.NAME.like
             (carryChecklistBo.getName()));
         queryWrapper.and(CARRY_CHECKLIST.MODEL.eq

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

@@ -55,8 +55,8 @@ public class FalseAlarmResultServiceImpl extends BaseServiceImpl<FalseAlarmResul
             (falseAlarmResultBo.getFalseAlarmId()));
         queryWrapper.and(FALSE_ALARM_RESULT.SORTIE_NO.eq
             (falseAlarmResultBo.getSortieNo()));
-        queryWrapper.and(FALSE_ALARM_RESULT.AIRCRAFT_NO.eq
-            (falseAlarmResultBo.getAircraftNo()));
+        queryWrapper.and(FALSE_ALARM_RESULT.AIRCRAFT_ID.eq
+            (falseAlarmResultBo.getAircraftId()));
         queryWrapper.and(FALSE_ALARM_RESULT.CODE.eq
             (falseAlarmResultBo.getCode()));
         queryWrapper.and(FALSE_ALARM_RESULT.NAME.like

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

@@ -53,8 +53,8 @@ public class FalseAlarmServiceImpl extends BaseServiceImpl<FalseAlarmMapper, Fal
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FALSE_ALARM.SORTIE_NO.eq
             (falseAlarmBo.getSortieNo()));
-        queryWrapper.and(FALSE_ALARM.AIRCRAFT_NO.eq
-            (falseAlarmBo.getAircraftNo()));
+        queryWrapper.and(FALSE_ALARM.AIRCRAFT_ID.eq
+            (falseAlarmBo.getAircraftId()));
         queryWrapper.and(FALSE_ALARM.STATUS.eq
             (falseAlarmBo.getStatus()));
 

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

@@ -55,8 +55,8 @@ public class FaultDiagnosisResultServiceImpl extends BaseServiceImpl<FaultDiagno
             (faultDiagnosisResultBo.getDiagnosisId()));
         queryWrapper.and(FAULT_DIAGNOSIS_RESULT.SORTIE_NO.eq
             (faultDiagnosisResultBo.getSortieNo()));
-        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.AIRCRAFT_NO.eq
-            (faultDiagnosisResultBo.getAircraftNo()));
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.AIRCRAFT_ID.eq
+            (faultDiagnosisResultBo.getAircraftId()));
         queryWrapper.and(FAULT_DIAGNOSIS_RESULT.STATUS.eq
             (faultDiagnosisResultBo.getStatus()));
 

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

@@ -53,8 +53,8 @@ public class FaultDiagnosisServiceImpl extends BaseServiceImpl<FaultDiagnosisMap
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_DIAGNOSIS.SORTIE_NO.eq
             (faultDiagnosisBo.getSortieNo()));
-        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_NO.eq
-            (faultDiagnosisBo.getAircraftNo()));
+        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_ID.eq
+            (faultDiagnosisBo.getAircraftId()));
 
         return queryWrapper;
     }

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

@@ -59,8 +59,8 @@ public class FlightTaskServiceImpl extends BaseServiceImpl<FlightTaskMapper, Fli
             (flightTaskBo.getSortieNo()));
         queryWrapper.and(FLIGHT_TASK.AIRCRAFT_MODEL.eq
             (flightTaskBo.getAircraftModel()));
-        queryWrapper.and(FLIGHT_TASK.AIRCRAFT_NO.eq
-            (flightTaskBo.getAircraftNo()));
+        queryWrapper.and(FLIGHT_TASK.AIRCRAFT_ID.eq
+            (flightTaskBo.getAircraftId()));
         queryWrapper.and(FLIGHT_TASK.START_TIME.eq
             (flightTaskBo.getStartTime()));
         queryWrapper.and(FLIGHT_TASK.END_TIME.eq

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

@@ -53,8 +53,8 @@ public class LifePredictionResultServiceImpl extends BaseServiceImpl<LifePredict
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(LIFE_PREDICTION_RESULT.LIFE_ID.eq
             (lifePredictionResultBo.getLifeId()));
-        queryWrapper.and(LIFE_PREDICTION_RESULT.AIRCRAFT_NO.eq
-            (lifePredictionResultBo.getAircraftNo()));
+        queryWrapper.and(LIFE_PREDICTION_RESULT.AIRCRAFT_ID.eq
+            (lifePredictionResultBo.getAircraftId()));
         queryWrapper.and(LIFE_PREDICTION_RESULT.NAME.like
             (lifePredictionResultBo.getName()));
         queryWrapper.and(LIFE_PREDICTION_RESULT.MODEL.eq

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

@@ -51,8 +51,8 @@ public class LifePredictionServiceImpl extends BaseServiceImpl<LifePredictionMap
 
     private QueryWrapper buildQueryWrapper(LifePredictionBo lifePredictionBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_NO.eq
-            (lifePredictionBo.getAircraftNo()));
+        queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_ID.eq
+            (lifePredictionBo.getAircraftId()));
         queryWrapper.and(LIFE_PREDICTION.NAME.like
             (lifePredictionBo.getName()));
         queryWrapper.and(LIFE_PREDICTION.MODEL.eq

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

@@ -53,8 +53,8 @@ public class MaintenanceDecisionServiceImpl extends BaseServiceImpl<MaintenanceD
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(MAINTENANCE_DECISION.SORTIE_NO.eq
             (maintenanceDecisionBo.getSortieNo()));
-        queryWrapper.and(MAINTENANCE_DECISION.AIRCRAFT_NO.eq
-            (maintenanceDecisionBo.getAircraftNo()));
+        queryWrapper.and(MAINTENANCE_DECISION.AIRCRAFT_ID.eq
+            (maintenanceDecisionBo.getAircraftId()));
         queryWrapper.and(MAINTENANCE_DECISION.CODE.eq
             (maintenanceDecisionBo.getCode()));
         queryWrapper.and(MAINTENANCE_DECISION.SYSTEM_NAME.like

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

@@ -57,8 +57,8 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_TYPE.eq
             (maintenanceRecordBo.getAircraftType()));
-        queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_NO.eq
-            (maintenanceRecordBo.getAircraftNo()));
+        queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_ID.eq
+            (maintenanceRecordBo.getAircraftId()));
         queryWrapper.and(MAINTENANCE_RECORD.SERIAL_NUMBER.eq
             (maintenanceRecordBo.getSerialNumber()));
         queryWrapper.and(MAINTENANCE_RECORD.SPECIALTY.eq

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

@@ -53,8 +53,8 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskM
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(MAINTENANCE_TASK.SORTIE_NO.eq
             (maintenanceTaskBo.getSortieNo()));
-        queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_NO.eq
-            (maintenanceTaskBo.getAircraftNo()));
+        queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_ID.eq
+            (maintenanceTaskBo.getAircraftId()));
         queryWrapper.and(MAINTENANCE_TASK.SYSTEM_NAME.like
             (maintenanceTaskBo.getSystemName()));
         queryWrapper.and(MAINTENANCE_TASK.UNIT_NAME.like

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

@@ -53,8 +53,8 @@ public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMappe
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(PRE_PROCESSING.SORTIE_NO.eq
             (preProcessingBo.getSortieNo()));
-        queryWrapper.and(PRE_PROCESSING.AIRCRAFT_NO.eq
-            (preProcessingBo.getAircraftNo()));
+        queryWrapper.and(PRE_PROCESSING.AIRCRAFT_ID.eq
+            (preProcessingBo.getAircraftId()));
         queryWrapper.and(PRE_PROCESSING.OSS_ID.eq
             (preProcessingBo.getOssId()));
         queryWrapper.and(PRE_PROCESSING.STATUS.eq

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

@@ -55,8 +55,8 @@ public class SmTaskRecordServiceImpl extends BaseServiceImpl<SmTaskRecordMapper,
 
     private QueryWrapper buildQueryWrapper(SmTaskRecordBo smTaskRecordBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(SM_TASK_RECORD.AIRCRAFT_NO.eq
-            (smTaskRecordBo.getAircraftNo()));
+        queryWrapper.and(SM_TASK_RECORD.AIRCRAFT_ID.eq
+            (smTaskRecordBo.getAircraftId()));
         queryWrapper.and(SM_TASK_RECORD.AIRCRAFT_MODEL.eq
             (smTaskRecordBo.getAircraftModel()));
         queryWrapper.and(SM_TASK_RECORD.NAME.like

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

@@ -55,8 +55,8 @@ public class SmTaskServiceImpl extends BaseServiceImpl<SmTaskMapper, SmTask> imp
 
     private QueryWrapper buildQueryWrapper(SmTaskBo smTaskBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(SM_TASK.AIRCRAFT_NO.eq
-            (smTaskBo.getAircraftNo()));
+        queryWrapper.and(SM_TASK.AIRCRAFT_ID.eq
+            (smTaskBo.getAircraftId()));
         queryWrapper.and(SM_TASK.AIRCRAFT_MODEL.eq
             (smTaskBo.getAircraftModel()));
         queryWrapper.and(SM_TASK.NAME.like

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

@@ -55,8 +55,8 @@ public class SmTaskSubServiceImpl extends BaseServiceImpl<SmTaskSubMapper, SmTas
 
     private QueryWrapper buildQueryWrapper(SmTaskSubBo smTaskSubBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(SM_TASK_SUB.AIRCRAFT_NO.eq
-            (smTaskSubBo.getAircraftNo()));
+        queryWrapper.and(SM_TASK_SUB.AIRCRAFT_ID.eq
+            (smTaskSubBo.getAircraftId()));
         queryWrapper.and(SM_TASK_SUB.AIRCRAFT_MODEL.eq
             (smTaskSubBo.getAircraftModel()));
         queryWrapper.and(SM_TASK_SUB.NAME.like

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

@@ -27,7 +27,7 @@ import java.util.List;
 import static org.eco.als.domain.table.TaskTableDef.TASK;
 
 /**
- * 任务管理Service业务层处理
+ * 任务信息Service业务层处理
  *
  * @author wgk
  * @date 2024-08-07
@@ -57,19 +57,15 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             (taskBo.getSource()));
         queryWrapper.and(TASK.SORTIE_NO.eq
             (taskBo.getSortieNo()));
-        queryWrapper.and(TASK.AIRCRAFT_ID.eq
-            (taskBo.getAircraftId()));
-        queryWrapper.and(TASK.DATA_ID.eq
-            (taskBo.getDataId()));
 
         return queryWrapper;
     }
 
     /**
-     * 查询任务管理
+     * 查询任务信息
      *
-     * @param id 任务管理主键
-     * @return 任务管理
+     * @param id 任务信息主键
+     * @return 任务信息
      */
     @Override
     public TaskVo selectById(Long id) {
@@ -79,10 +75,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
 
     /**
-     * 查询任务管理列表
+     * 查询任务信息列表
      *
-     * @param taskBo 任务管理Bo
-     * @return 任务管理集合
+     * @param taskBo 任务信息Bo
+     * @return 任务信息集合
      */
     @Override
     public List<TaskVo> selectList(TaskBo taskBo) {
@@ -91,10 +87,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     }
 
     /**
-     * 分页查询任务管理列表
+     * 分页查询任务信息列表
      *
-     * @param taskBo 任务管理Bo
-     * @return 分页任务管理集合
+     * @param taskBo 任务信息Bo
+     * @return 分页任务信息集合
      */
     @Override
     public PageResult<TaskVo> selectPage(TaskBo taskBo) {
@@ -104,9 +100,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     }
 
     /**
-     * 新增任务管理
+     * 新增任务信息
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
@@ -117,9 +113,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     }
 
     /**
-     * 新增任务管理，前台提供主键值，一般用于导入的场合
+     * 新增任务信息，前台提供主键值，一般用于导入的场合
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
@@ -131,17 +127,16 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     }
 
     /**
-     * 修改任务管理
+     * 修改任务信息
      *
-     * @param taskBo 任务管理Bo
+     * @param taskBo 任务信息Bo
      * @return 结果:true 更新成功，false 更新失败
      */
     @Override
     public boolean update(TaskBo taskBo) {
         Task task = MapstructUtils.convert(taskBo, Task.class);
         if (ObjectUtil.isNotNull(task) && ObjectUtil.isNotNull(task.getId())) {
-            boolean updated = this.updateById(task);
-            return updated;
+            return this.updateById(task);
         }
         return false;
     }
@@ -156,9 +151,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     }
 
     /**
-     * 批量删除任务管理
+     * 批量删除任务信息
      *
-     * @param ids 需要删除的任务管理主键集合
+     * @param ids 需要删除的任务信息主键集合
      * @return 结果:true 删除成功，false 删除失败
      */
     @Transactional

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

@@ -57,8 +57,8 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(WARNING.SORTIE_NO.eq
             (warningBo.getSortieNo()));
-        queryWrapper.and(WARNING.AIRCRAFT_NO.eq
-            (warningBo.getAircraftNo()));
+        queryWrapper.and(WARNING.AIRCRAFT_ID.eq
+            (warningBo.getAircraftId()));
         queryWrapper.and(WARNING.CODE.eq
             (warningBo.getCode()));
         queryWrapper.and(WARNING.NAME.like