feat: 故障诊断/故障诊断结果

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

@@ -0,0 +1,121 @@
+package org.eco.als.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.FaultDiagnosisBo;
+import org.eco.als.domain.vo.FaultDiagnosisVo;
+import org.eco.als.service.IFaultDiagnosisService;
+import org.eco.common.core.core.domain.CommonResult;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.log.annotation.Log;
+import org.eco.common.log.enums.BusinessType;
+import org.eco.common.security.utils.LoginHelper;
+import org.eco.common.web.annotation.RepeatSubmit;
+import org.eco.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 故障诊断Controller
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/als/faultDiagnosis")
+public class FaultDiagnosisController extends BaseController {
+    @Resource
+    private IFaultDiagnosisService faultDiagnosisService;
+
+    /**
+     * 查询故障诊断列表
+     */
+    @SaCheckPermission("als:faultDiagnosis:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<FaultDiagnosisVo>> list(FaultDiagnosisBo faultDiagnosisBo) {
+        return CommonResult.success(faultDiagnosisService.selectPage(faultDiagnosisBo));
+    }
+
+    /**
+     * 导出故障诊断列表
+     */
+    @SaCheckPermission("als:faultDiagnosis:export")
+    @Log(title = "故障诊断", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public CommonResult<Void> export(FaultDiagnosisBo faultDiagnosisBo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        List<FaultDiagnosisVo> list = faultDiagnosisService.selectList(faultDiagnosisBo);
+        if (CollUtil.isEmpty(list)) {
+            return CommonResult.fail("导出列表为空");
+        }
+        faultDiagnosisService.asyncExport(list, "故障诊断", loginUser);
+        return CommonResult.success();
+    }
+
+    /**
+     * 获取故障诊断详细信息
+     */
+    @SaCheckPermission("als:faultDiagnosis:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<FaultDiagnosisVo> getInfo(@PathVariable Long id) {
+        return CommonResult.success(faultDiagnosisService.selectById(id));
+    }
+
+    /**
+     * 新增故障诊断
+     */
+    @SaCheckPermission("als:faultDiagnosis:add")
+    @Log(title = "故障诊断", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody FaultDiagnosisBo faultDiagnosisBo) {
+        boolean inserted = faultDiagnosisService.insert(faultDiagnosisBo);
+        if (!inserted) {
+            return CommonResult.fail("新增故障诊断记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改故障诊断
+     */
+    @SaCheckPermission("als:faultDiagnosis:edit")
+    @Log(title = "故障诊断", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody FaultDiagnosisBo faultDiagnosisBo) {
+        boolean updated = faultDiagnosisService.update(faultDiagnosisBo);
+        if (!updated) {
+            return CommonResult.fail("修改故障诊断记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除故障诊断
+     */
+    @SaCheckPermission("als:faultDiagnosis:remove")
+    @Log(title = "故障诊断", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = faultDiagnosisService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除故障诊断记录失败!");
+        }
+        return CommonResult.success();
+    }
+}

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

@@ -0,0 +1,121 @@
+package org.eco.als.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.FaultDiagnosisResultBo;
+import org.eco.als.domain.vo.FaultDiagnosisResultVo;
+import org.eco.als.service.IFaultDiagnosisResultService;
+import org.eco.common.core.core.domain.CommonResult;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.log.annotation.Log;
+import org.eco.common.log.enums.BusinessType;
+import org.eco.common.security.utils.LoginHelper;
+import org.eco.common.web.annotation.RepeatSubmit;
+import org.eco.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 故障诊断结果Controller
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/als/faultDiagnosisResult")
+public class FaultDiagnosisResultController extends BaseController {
+    @Resource
+    private IFaultDiagnosisResultService faultDiagnosisResultService;
+
+    /**
+     * 查询故障诊断结果列表
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<FaultDiagnosisResultVo>> list(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        return CommonResult.success(faultDiagnosisResultService.selectPage(faultDiagnosisResultBo));
+    }
+
+    /**
+     * 导出故障诊断结果列表
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:export")
+    @Log(title = "故障诊断结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public CommonResult<Void> export(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        List<FaultDiagnosisResultVo> list = faultDiagnosisResultService.selectList(faultDiagnosisResultBo);
+        if (CollUtil.isEmpty(list)) {
+            return CommonResult.fail("导出列表为空");
+        }
+        faultDiagnosisResultService.asyncExport(list, "故障诊断结果", loginUser);
+        return CommonResult.success();
+    }
+
+    /**
+     * 获取故障诊断结果详细信息
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<FaultDiagnosisResultVo> getInfo(@PathVariable Long id) {
+        return CommonResult.success(faultDiagnosisResultService.selectById(id));
+    }
+
+    /**
+     * 新增故障诊断结果
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:add")
+    @Log(title = "故障诊断结果", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        boolean inserted = faultDiagnosisResultService.insert(faultDiagnosisResultBo);
+        if (!inserted) {
+            return CommonResult.fail("新增故障诊断结果记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改故障诊断结果
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:edit")
+    @Log(title = "故障诊断结果", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        boolean updated = faultDiagnosisResultService.update(faultDiagnosisResultBo);
+        if (!updated) {
+            return CommonResult.fail("修改故障诊断结果记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除故障诊断结果
+     */
+    @SaCheckPermission("als:faultDiagnosisResult:remove")
+    @Log(title = "故障诊断结果", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = faultDiagnosisResultService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除故障诊断结果记录失败!");
+        }
+        return CommonResult.success();
+    }
+}

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

@@ -2,16 +2,13 @@ package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.PreProcessingBo;
-import org.eco.als.domain.vo.PreProcessingImportVo;
 import org.eco.als.domain.vo.PreProcessingVo;
 import org.eco.als.service.IPreProcessingService;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
-import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
@@ -26,9 +23,7 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -67,24 +62,6 @@ public class PreProcessingController extends BaseController {
         return CommonResult.success();
     }
 
-    @SaCheckPermission("als:preProcessing:import")
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) {
-        ExcelUtil.exportExcel(new ArrayList<>(), "预处理", PreProcessingImportVo.class, response);
-    }
-
-    /**
-     * 导入预处理列表
-     */
-    @Log(title = "预处理", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("als:preProcessing:import")
-    @PostMapping("/importData")
-    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        preProcessingService.asyncImportData(file, updateSupport, loginUser);
-        return CommonResult.success();
-    }
-
     /**
      * 获取预处理详细信息
      */

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

@@ -0,0 +1,53 @@
+package org.eco.als.domain;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 故障诊断对象 als_fault_diagnosis_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table(value = "als_fault_diagnosis_t")
+public class FaultDiagnosis extends BaseEntity {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @Column(isLogicDelete = true)
+    private Integer delFlag;
+
+
+}

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

@@ -0,0 +1,58 @@
+package org.eco.als.domain;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 故障诊断结果对象 als_fault_diagnosis_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table(value = "als_fault_diagnosis_result_t")
+public class FaultDiagnosisResult extends BaseEntity {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    private Long id;
+
+    /**
+     * 故障诊断编号
+     */
+    private Long diagnosisId;
+
+    /**
+     * 架次号
+     */
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @Column(isLogicDelete = true)
+    private Integer delFlag;
+
+
+}

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

@@ -0,0 +1,44 @@
+package org.eco.als.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultDiagnosis;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+/**
+ * 故障诊断业务对象 als_fault_diagnosis_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultDiagnosis.class, reverseConvertGenerate = false)
+public class FaultDiagnosisBo extends BaseEntity {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    @NotBlank(message = "架次号不能为空")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @NotBlank(message = "机号不能为空")
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    @NotBlank(message = "状态（1正常）不能为空")
+    private String status;
+
+
+}

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

@@ -0,0 +1,51 @@
+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.FaultDiagnosisResult;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+/**
+ * 故障诊断结果业务对象 als_fault_diagnosis_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultDiagnosisResult.class, reverseConvertGenerate = false)
+public class FaultDiagnosisResultBo extends BaseEntity {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 故障诊断编号
+     */
+    @NotNull(message = "故障诊断编号不能为空")
+    private Long diagnosisId;
+
+    /**
+     * 架次号
+     */
+    @NotBlank(message = "架次号不能为空")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @NotBlank(message = "机号不能为空")
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    @NotBlank(message = "状态（1正常）不能为空")
+    private String status;
+
+
+}

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

@@ -1,54 +0,0 @@
-package org.eco.als.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 虚警抑制导入视图对象 als_false_alarm_t
- *
- * @author wgk
- * @date 2024-07-23
- */
-
-@Data
-@NoArgsConstructor
-@ExcelIgnoreUnannotated
-public class FalseAlarmImportVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 架次号
-     */
-    @ExcelProperty(value = "架次号")
-    private String sortieNo;
-
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    private String aircraftNo;
-
-    /**
-     * 状态
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
-    private String status;
-
-    /**
-     * 删除标识（1删除 0未删除）
-     */
-    private Integer delFlag;
-
-
-}

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

@@ -1,78 +0,0 @@
-package org.eco.als.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 虚警抑制结果导入视图对象 als_false_alarm_result_t
- *
- * @author wgk
- * @date 2024-07-23
- */
-
-@Data
-@NoArgsConstructor
-@ExcelIgnoreUnannotated
-public class FalseAlarmResultImportVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 虚警抑制Id
-     */
-    @ExcelProperty(value = "虚警抑制Id")
-    private Long falseAlarmId;
-
-    /**
-     * 架次号
-     */
-    @ExcelProperty(value = "架次号")
-    private String sortieNo;
-
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    private String aircraftNo;
-
-    /**
-     * 警告代码
-     */
-    @ExcelProperty(value = "警告代码")
-    private String code;
-
-    /**
-     * 警告名称
-     */
-    @ExcelProperty(value = "警告名称")
-    private String name;
-
-    /**
-     * 警告描述
-     */
-    @ExcelProperty(value = "警告描述")
-    private String describe;
-
-    /**
-     * 状态
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
-    private String status;
-
-    /**
-     * 删除标识（1删除 0未删除）
-     */
-    private Integer delFlag;
-
-
-}

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

@@ -0,0 +1,83 @@
+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 io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultDiagnosisResult;
+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;
+import java.io.Serializable;
+
+/**
+ * 故障诊断结果视图对象 als_fault_diagnosis_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultDiagnosisResult.class)
+public class FaultDiagnosisResultVo extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 故障诊断编号
+     */
+    @ExcelProperty(value = "故障诊断编号")
+    private Long diagnosisId;
+
+    /**
+     * 架次号
+     */
+    @ExcelProperty(value = "架次号")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @ExcelProperty(value = "机号")
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "common_type")
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @ExcelProperty(value = "删除标识（1删除 0未删除）")
+    private Integer delFlag;
+
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
+
+}

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

@@ -0,0 +1,74 @@
+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 io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultDiagnosis;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 故障诊断视图对象 als_fault_diagnosis_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultDiagnosis.class)
+public class FaultDiagnosisVo extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    @ExcelProperty(value = "架次号")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @ExcelProperty(value = "机号")
+    private String aircraftNo;
+
+    /**
+     * 状态（1正常）
+     */
+    @ExcelProperty(value = "状态（1正常）")
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @ExcelProperty(value = "删除标识（1删除 0未删除）")
+    private Integer delFlag;
+
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建人名称
+     */
+    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
+
+}

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

@@ -1,61 +0,0 @@
-package org.eco.als.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 预处理导入视图对象 als_pre_processing_t
- *
- * @author wgk
- * @date 2024-07-22
- */
-
-@Data
-@NoArgsConstructor
-@ExcelIgnoreUnannotated
-public class PreProcessingImportVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 架次号
-     */
-    @ExcelProperty(value = "架次号")
-    private String sortieNo;
-
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    private String aircraftNo;
-
-    /**
-     * 文件Id
-     */
-    @ExcelProperty(value = "文件Id")
-    private Long ossId;
-
-    /**
-     * 状态
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
-    private String status;
-
-    /**
-     * 删除标识（1删除 0未删除）
-     */
-    @ExcelProperty(value = "删除标识（1删除 0未删除）")
-    private Integer delFlag;
-
-
-}

als-modules/agile-assurance/src/main/java/org/eco/als/listener/PreProcessingImportListener.java

@@ -1,127 +0,0 @@
-package org.eco.als.listener;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import lombok.extern.slf4j.Slf4j;
-import org.eco.als.domain.bo.PreProcessingBo;
-import org.eco.als.domain.vo.PreProcessingImportVo;
-import org.eco.als.domain.vo.PreProcessingVo;
-import org.eco.als.service.IPreProcessingService;
-import org.eco.common.core.core.domain.model.LoginUser;
-import org.eco.common.core.utils.SpringUtils;
-import org.eco.common.core.utils.ValidatorUtils;
-import org.eco.common.excel.core.ExcelListener;
-import org.eco.common.excel.core.ExcelResult;
-import org.eco.common.excel.entity.ExcelResultRes;
-
-import java.util.List;
-
-/**
- * 预处理自定义导入
- *
- * @author wgk
- */
-@Slf4j
-public class PreProcessingImportListener extends AnalysisEventListener<PreProcessingImportVo> implements ExcelListener<PreProcessingImportVo> {
-    private final IPreProcessingService preProcessingService;
-
-    private final Boolean isUpdateSupport;
-    private final LoginUser loginUser;
-    private int successNum = 0;
-    private int failureNum = 0;
-    private final StringBuilder successMsg = new StringBuilder();
-    private final StringBuilder failureMsg = new StringBuilder();
-
-    public PreProcessingImportListener(Boolean isUpdateSupport, LoginUser loginUser) {
-        this.preProcessingService = SpringUtils.getBean(IPreProcessingService.class);
-        this.isUpdateSupport = isUpdateSupport;
-        this.loginUser = loginUser;
-    }
-
-    @Override
-    public void invoke(PreProcessingImportVo preProcessingVo, AnalysisContext context) {
-        try {
-
-            PreProcessingBo preProcessingBo = BeanUtil.toBean(preProcessingVo, PreProcessingBo.class);
-
-            PreProcessingVo preProcessingVo1 = null;
-
-            //preProcessingVo1 = preProcessingService.selectBySomefield(preProcessingVo.getSomefield());
-            if (ObjectUtil.isNull(preProcessingVo1)) {
-                //不存在就新增
-                setBo(preProcessingBo);
-                ValidatorUtils.validate(preProcessingBo);
-                boolean inserted = preProcessingService.insert(preProcessingBo);
-
-                if (inserted) {
-                    successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、预处理 记录导入成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>").append(failureNum).append("、预处理 记录导入失败");
-                }
-            } else if (isUpdateSupport) {
-                //存在就更新
-                preProcessingBo.setId(preProcessingVo1.getId());//主键
-                preProcessingBo.setVersion(preProcessingVo1.getVersion());
-                boolean updated = preProcessingService.update(preProcessingBo);
-                if (updated) {
-                    successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、预处理 记录更新成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>").append(failureNum).append("、预处理 记录更新失败");
-                }
-            }
-        } catch (Exception e) {
-            failureNum++;
-            String msg = "<br/>" + failureNum + "、预处理 记录导入失败：" ;
-            failureMsg.append(msg).append(e.getMessage());
-            log.error(msg, e);
-        }
-    }
-
-    private void setBo(PreProcessingBo preProcessingBo) {
-        preProcessingBo.setVersion(0);
-        preProcessingBo.setCreateBy(loginUser.getUserId());
-        preProcessingBo.setUpdateBy(loginUser.getUserId());
-        preProcessingBo.setTenantId(loginUser.getTenantId());
-    }
-
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        log.info("解析完成");
-    }
-
-    @Override
-    public ExcelResult<PreProcessingImportVo> getExcelResult() {
-        return new ExcelResult<>() {
-
-            @Override
-            public ExcelResultRes getAnalysis() {
-                if (failureNum > 0 && successNum == 0) {
-                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：");
-                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("0").build();
-                } else if (failureNum > 0 && successNum > 0) {
-                    failureMsg.insert(0, "很抱歉，部分导入失败！共 " + failureNum + " 条数据没有成功导入，错误如下：");
-                    return ExcelResultRes.builder().logInfo(failureMsg.toString()).status("2").build();
-                } else {
-                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-                    return ExcelResultRes.builder().logInfo(successMsg.toString()).status("1").build();
-                }
-            }
-
-            @Override
-            public List<PreProcessingImportVo> getList() {
-                return null;
-            }
-
-            @Override
-            public List<String> getErrorList() {
-                return null;
-            }
-        };
-    }
-}

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/FaultDiagnosisMapper.java

@@ -0,0 +1,16 @@
+package org.eco.als.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.eco.als.domain.FaultDiagnosis;
+
+/**
+ * 故障诊断Mapper接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Mapper
+public interface FaultDiagnosisMapper extends BaseMapper<FaultDiagnosis> {
+
+}

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/FaultDiagnosisResultMapper.java

@@ -0,0 +1,16 @@
+package org.eco.als.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.eco.als.domain.FaultDiagnosisResult;
+
+/**
+ * 故障诊断结果Mapper接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Mapper
+public interface FaultDiagnosisResultMapper extends BaseMapper<FaultDiagnosisResult> {
+
+}

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

@@ -0,0 +1,86 @@
+package org.eco.als.service;
+
+import org.eco.als.domain.FaultDiagnosisResult;
+import org.eco.als.domain.bo.FaultDiagnosisResultBo;
+import org.eco.als.domain.vo.FaultDiagnosisResultVo;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.orm.core.service.IBaseService;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.List;
+
+/**
+ * 故障诊断结果Service接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+public interface IFaultDiagnosisResultService extends IBaseService<FaultDiagnosisResult> {
+    /**
+     * 查询故障诊断结果
+     *
+     * @param id 故障诊断结果主键
+     * @return 故障诊断结果
+     */
+    FaultDiagnosisResultVo selectById(Long id);
+
+    /**
+     * 查询故障诊断结果列表
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 故障诊断结果集合
+     */
+    List<FaultDiagnosisResultVo> selectList(FaultDiagnosisResultBo faultDiagnosisResultBo);
+
+    /**
+     * 分页查询故障诊断结果列表
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 分页故障诊断结果集合
+     */
+    PageResult<FaultDiagnosisResultVo> selectPage(FaultDiagnosisResultBo faultDiagnosisResultBo);
+
+    /**
+     * 新增故障诊断结果
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insert(FaultDiagnosisResultBo faultDiagnosisResultBo);
+
+    /**
+     * 新增故障诊断结果，前台提供主键值，一般用于导入的场合
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insertWithPk(FaultDiagnosisResultBo faultDiagnosisResultBo);
+
+    /**
+     * 修改故障诊断结果
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    boolean update(FaultDiagnosisResultBo faultDiagnosisResultBo);
+
+    /**
+     * 批量删除故障诊断结果
+     *
+     * @param ids 需要删除的故障诊断结果主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    boolean deleteByIds(Long[] ids);
+
+    /**
+     * asyncExport 异步导出
+     *
+     * @param listVo    数据列表
+     * @param sheetName 文件名称
+     * @param user      上下文
+     */
+    @Async
+    void asyncExport(List<FaultDiagnosisResultVo> listVo, String sheetName, LoginUser user);
+
+}

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

@@ -0,0 +1,86 @@
+package org.eco.als.service;
+
+import org.eco.als.domain.FaultDiagnosis;
+import org.eco.als.domain.bo.FaultDiagnosisBo;
+import org.eco.als.domain.vo.FaultDiagnosisVo;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.orm.core.service.IBaseService;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.List;
+
+/**
+ * 故障诊断Service接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+public interface IFaultDiagnosisService extends IBaseService<FaultDiagnosis> {
+    /**
+     * 查询故障诊断
+     *
+     * @param id 故障诊断主键
+     * @return 故障诊断
+     */
+    FaultDiagnosisVo selectById(Long id);
+
+    /**
+     * 查询故障诊断列表
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 故障诊断集合
+     */
+    List<FaultDiagnosisVo> selectList(FaultDiagnosisBo faultDiagnosisBo);
+
+    /**
+     * 分页查询故障诊断列表
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 分页故障诊断集合
+     */
+    PageResult<FaultDiagnosisVo> selectPage(FaultDiagnosisBo faultDiagnosisBo);
+
+    /**
+     * 新增故障诊断
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insert(FaultDiagnosisBo faultDiagnosisBo);
+
+    /**
+     * 新增故障诊断，前台提供主键值，一般用于导入的场合
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insertWithPk(FaultDiagnosisBo faultDiagnosisBo);
+
+    /**
+     * 修改故障诊断
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    boolean update(FaultDiagnosisBo faultDiagnosisBo);
+
+    /**
+     * 批量删除故障诊断
+     *
+     * @param ids 需要删除的故障诊断主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    boolean deleteByIds(Long[] ids);
+
+    /**
+     * asyncExport 异步导出
+     *
+     * @param listVo    数据列表
+     * @param sheetName 文件名称
+     * @param user      上下文
+     */
+    @Async
+    void asyncExport(List<FaultDiagnosisVo> listVo, String sheetName, LoginUser user);
+
+}

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

@@ -7,7 +7,6 @@ import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.IBaseService;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -74,16 +73,6 @@ public interface IPreProcessingService extends IBaseService<PreProcessing> {
      */
     boolean deleteByIds(Long[] ids);
 
-    /**
-     * 异步导入
-     *
-     * @param file          导入的文件
-     * @param updateSupport 是否覆盖
-     * @param user          用户上下文信息
-     */
-    @Async
-    void asyncImportData(MultipartFile file, boolean updateSupport, LoginUser user);
-
     /**
      * asyncExport 异步导出
      *

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

@@ -0,0 +1,167 @@
+package org.eco.als.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.FaultDiagnosisResult;
+import org.eco.als.domain.bo.FaultDiagnosisResultBo;
+import org.eco.als.domain.vo.FaultDiagnosisResultVo;
+import org.eco.als.mapper.FaultDiagnosisResultMapper;
+import org.eco.als.service.IFaultDiagnosisResultService;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
+import org.eco.common.excel.entity.ExcelResultRes;
+import org.eco.common.excel.service.IExcelService;
+import org.eco.common.orm.core.page.PageQuery;
+import org.eco.common.orm.core.service.impl.BaseServiceImpl;
+import org.eco.system.service.IImportExportService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.eco.als.domain.table.FaultDiagnosisResultTableDef.FAULT_DIAGNOSIS_RESULT;
+
+/**
+ * 故障诊断结果Service业务层处理
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Service
+@Slf4j
+public class FaultDiagnosisResultServiceImpl extends BaseServiceImpl<FaultDiagnosisResultMapper, FaultDiagnosisResult> implements IFaultDiagnosisResultService {
+    @Resource
+    private FaultDiagnosisResultMapper faultDiagnosisResultMapper;
+
+    @Resource
+    private IExcelService excelService;
+
+    @Resource
+    private IImportExportService importExportService;
+
+    @Override
+    public QueryWrapper query() {
+        return super.query().from(FAULT_DIAGNOSIS_RESULT);
+    }
+
+    private QueryWrapper buildQueryWrapper(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.and(FAULT_DIAGNOSIS_RESULT.DIAGNOSIS_ID.eq
+            (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.STATUS.eq
+            (faultDiagnosisResultBo.getStatus()));
+
+        return queryWrapper;
+    }
+
+    /**
+     * 查询故障诊断结果
+     *
+     * @param id 故障诊断结果主键
+     * @return 故障诊断结果
+     */
+    @Override
+    public FaultDiagnosisResultVo selectById(Long id) {
+        return this.getOneAs(query().where(FAULT_DIAGNOSIS_RESULT.ID.eq(id)), FaultDiagnosisResultVo.class);
+
+    }
+
+
+    /**
+     * 查询故障诊断结果列表
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 故障诊断结果集合
+     */
+    @Override
+    public List<FaultDiagnosisResultVo> selectList(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(faultDiagnosisResultBo);
+        return this.listAs(queryWrapper, FaultDiagnosisResultVo.class);
+    }
+
+    /**
+     * 分页查询故障诊断结果列表
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 分页故障诊断结果集合
+     */
+    @Override
+    public PageResult<FaultDiagnosisResultVo> selectPage(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(faultDiagnosisResultBo);
+        Page<FaultDiagnosisResultVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultDiagnosisResultVo.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 新增故障诊断结果
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insert(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        FaultDiagnosisResult faultDiagnosisResult = MapstructUtils.convert(faultDiagnosisResultBo, FaultDiagnosisResult.class);
+
+        return this.save(faultDiagnosisResult);//使用全局配置的雪花算法主键生成器生成ID值
+    }
+
+    /**
+     * 新增故障诊断结果，前台提供主键值，一般用于导入的场合
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insertWithPk(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        FaultDiagnosisResult faultDiagnosisResult = MapstructUtils.convert(faultDiagnosisResultBo, FaultDiagnosisResult.class);
+
+
+        return faultDiagnosisResultMapper.insertWithPk(faultDiagnosisResult) > 0;//前台传来主键值
+    }
+
+    /**
+     * 修改故障诊断结果
+     *
+     * @param faultDiagnosisResultBo 故障诊断结果Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    @Override
+    public boolean update(FaultDiagnosisResultBo faultDiagnosisResultBo) {
+        FaultDiagnosisResult faultDiagnosisResult = MapstructUtils.convert(faultDiagnosisResultBo, FaultDiagnosisResult.class);
+        if (ObjectUtil.isNotNull(faultDiagnosisResult) && ObjectUtil.isNotNull(faultDiagnosisResult.getId())) {
+            return this.updateById(faultDiagnosisResult);
+        }
+        return false;
+    }
+
+    @Override
+    public void asyncExport(List<FaultDiagnosisResultVo> listVo, String sheetName, LoginUser loginUser) {
+        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FaultDiagnosisResultVo.class);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
+        if (flag) {
+            log.info("异步导出日志写入成功");
+        }
+    }
+
+    /**
+     * 批量删除故障诊断结果
+     *
+     * @param ids 需要删除的故障诊断结果主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    @Transactional
+    @Override
+    public boolean deleteByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -0,0 +1,163 @@
+package org.eco.als.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.FaultDiagnosis;
+import org.eco.als.domain.bo.FaultDiagnosisBo;
+import org.eco.als.domain.vo.FaultDiagnosisVo;
+import org.eco.als.mapper.FaultDiagnosisMapper;
+import org.eco.als.service.IFaultDiagnosisService;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
+import org.eco.common.excel.entity.ExcelResultRes;
+import org.eco.common.excel.service.IExcelService;
+import org.eco.common.orm.core.page.PageQuery;
+import org.eco.common.orm.core.service.impl.BaseServiceImpl;
+import org.eco.system.service.IImportExportService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.eco.als.domain.table.FaultDiagnosisTableDef.FAULT_DIAGNOSIS;
+
+/**
+ * 故障诊断Service业务层处理
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Service
+@Slf4j
+public class FaultDiagnosisServiceImpl extends BaseServiceImpl<FaultDiagnosisMapper, FaultDiagnosis> implements IFaultDiagnosisService {
+    @Resource
+    private FaultDiagnosisMapper faultDiagnosisMapper;
+
+    @Resource
+    private IExcelService excelService;
+
+    @Resource
+    private IImportExportService importExportService;
+
+    @Override
+    public QueryWrapper query() {
+        return super.query().from(FAULT_DIAGNOSIS);
+    }
+
+    private QueryWrapper buildQueryWrapper(FaultDiagnosisBo faultDiagnosisBo) {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.and(FAULT_DIAGNOSIS.SORTIE_NO.eq
+            (faultDiagnosisBo.getSortieNo()));
+        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_NO.eq
+            (faultDiagnosisBo.getAircraftNo()));
+
+        return queryWrapper;
+    }
+
+    /**
+     * 查询故障诊断
+     *
+     * @param id 故障诊断主键
+     * @return 故障诊断
+     */
+    @Override
+    public FaultDiagnosisVo selectById(Long id) {
+        return this.getOneAs(query().where(FAULT_DIAGNOSIS.ID.eq(id)), FaultDiagnosisVo.class);
+
+    }
+
+
+    /**
+     * 查询故障诊断列表
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 故障诊断集合
+     */
+    @Override
+    public List<FaultDiagnosisVo> selectList(FaultDiagnosisBo faultDiagnosisBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(faultDiagnosisBo);
+        return this.listAs(queryWrapper, FaultDiagnosisVo.class);
+    }
+
+    /**
+     * 分页查询故障诊断列表
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 分页故障诊断集合
+     */
+    @Override
+    public PageResult<FaultDiagnosisVo> selectPage(FaultDiagnosisBo faultDiagnosisBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(faultDiagnosisBo);
+        Page<FaultDiagnosisVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultDiagnosisVo.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 新增故障诊断
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insert(FaultDiagnosisBo faultDiagnosisBo) {
+        FaultDiagnosis faultDiagnosis = MapstructUtils.convert(faultDiagnosisBo, FaultDiagnosis.class);
+
+        return this.save(faultDiagnosis);//使用全局配置的雪花算法主键生成器生成ID值
+    }
+
+    /**
+     * 新增故障诊断，前台提供主键值，一般用于导入的场合
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insertWithPk(FaultDiagnosisBo faultDiagnosisBo) {
+        FaultDiagnosis faultDiagnosis = MapstructUtils.convert(faultDiagnosisBo, FaultDiagnosis.class);
+
+
+        return faultDiagnosisMapper.insertWithPk(faultDiagnosis) > 0;//前台传来主键值
+    }
+
+    /**
+     * 修改故障诊断
+     *
+     * @param faultDiagnosisBo 故障诊断Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    @Override
+    public boolean update(FaultDiagnosisBo faultDiagnosisBo) {
+        FaultDiagnosis faultDiagnosis = MapstructUtils.convert(faultDiagnosisBo, FaultDiagnosis.class);
+        if (ObjectUtil.isNotNull(faultDiagnosis) && ObjectUtil.isNotNull(faultDiagnosis.getId())) {
+            return this.updateById(faultDiagnosis);
+        }
+        return false;
+    }
+
+    @Override
+    public void asyncExport(List<FaultDiagnosisVo> listVo, String sheetName, LoginUser loginUser) {
+        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FaultDiagnosisVo.class);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
+        if (flag) {
+            log.info("异步导出日志写入成功");
+        }
+    }
+
+    /**
+     * 批量删除故障诊断
+     *
+     * @param ids 需要删除的故障诊断主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    @Transactional
+    @Override
+    public boolean deleteByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -7,9 +7,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.PreProcessing;
 import org.eco.als.domain.bo.PreProcessingBo;
-import org.eco.als.domain.vo.PreProcessingImportVo;
 import org.eco.als.domain.vo.PreProcessingVo;
-import org.eco.als.listener.PreProcessingImportListener;
 import org.eco.als.mapper.PreProcessingMapper;
 import org.eco.als.service.IPreProcessingService;
 import org.eco.common.core.core.domain.model.LoginUser;
@@ -22,9 +20,7 @@ import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -147,21 +143,6 @@ public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMappe
         return false;
     }
 
-    @Override
-    public void asyncImportData(MultipartFile file, boolean updateSupport, LoginUser loginUser) {
-        ExcelResultRes result;
-        try {
-            String name = file.getOriginalFilename();
-            result = excelService.importExcel(file.getInputStream(), name, PreProcessingImportVo.class, new PreProcessingImportListener(updateSupport, loginUser));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        boolean flag = importExportService.saveInfo(result, loginUser, "0");
-        if (flag) {
-            log.info("异步导入日志写入成功");
-        }
-    }
-
     @Override
     public void asyncExport(List<PreProcessingVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, PreProcessingVo.class);

als-modules/agile-assurance/src/main/resources/mapper/als/FaultDiagnosisMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.eco.als.mapper.FaultDiagnosisMapper">
+
+</mapper>

als-modules/agile-assurance/src/main/resources/mapper/als/FaultDiagnosisResultMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.eco.als.mapper.FaultDiagnosisResultMapper">
+
+</mapper>