虚警抑制/虚警抑制结果

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

@@ -0,0 +1,117 @@
+package org.eco.als.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import org.eco.als.domain.bo.FalseAlarmBo;
+import org.eco.als.domain.vo.FalseAlarmVo;
+import org.eco.als.service.IFalseAlarmService;
+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/falseAlarm")
+public class FalseAlarmController extends BaseController {
+    @Resource
+    private IFalseAlarmService falseAlarmService;
+
+    /**
+     * 查询虚警抑制列表
+     */
+    @SaCheckPermission("als:falseAlarm:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<FalseAlarmVo>> list(FalseAlarmBo falseAlarmBo) {
+        return CommonResult.success(falseAlarmService.selectPage(falseAlarmBo));
+    }
+
+    /**
+     * 导出虚警抑制列表
+     */
+    @SaCheckPermission("als:falseAlarm:export")
+    @Log(title = "虚警抑制", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public CommonResult<Void> export(FalseAlarmBo falseAlarmBo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        List<FalseAlarmVo> list = falseAlarmService.selectList(falseAlarmBo);
+        falseAlarmService.asyncExport(list, "虚警抑制", loginUser);
+        return CommonResult.success();
+    }
+
+    /**
+     * 获取虚警抑制详细信息
+     */
+    @SaCheckPermission("als:falseAlarm:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<FalseAlarmVo> getInfo(@PathVariable Long id) {
+        return CommonResult.success(falseAlarmService.selectById(id));
+    }
+
+    /**
+     * 新增虚警抑制
+     */
+    @SaCheckPermission("als:falseAlarm:add")
+    @Log(title = "虚警抑制", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody FalseAlarmBo falseAlarmBo) {
+        boolean inserted = falseAlarmService.insert(falseAlarmBo);
+        if (!inserted) {
+            return CommonResult.fail("新增虚警抑制记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改虚警抑制
+     */
+    @SaCheckPermission("als:falseAlarm:edit")
+    @Log(title = "虚警抑制", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody FalseAlarmBo falseAlarmBo) {
+        boolean updated = falseAlarmService.update(falseAlarmBo);
+        if (!updated) {
+            return CommonResult.fail("修改虚警抑制记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除虚警抑制
+     */
+    @SaCheckPermission("als:falseAlarm:remove")
+    @Log(title = "虚警抑制", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = falseAlarmService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除虚警抑制记录失败!");
+        }
+        return CommonResult.success();
+    }
+}

als-modules/agile-assurance/src/main/java/org/eco/als/controller/FalseAlarmResultController.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.FalseAlarmResultBo;
+import org.eco.als.domain.vo.FalseAlarmResultVo;
+import org.eco.als.service.IFalseAlarmResultService;
+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/falseAlarmResult")
+public class FalseAlarmResultController extends BaseController {
+    @Resource
+    private IFalseAlarmResultService falseAlarmResultService;
+
+    /**
+     * 查询虚警抑制结果列表
+     */
+    @SaCheckPermission("als:falseAlarmResult:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<FalseAlarmResultVo>> list(FalseAlarmResultBo falseAlarmResultBo) {
+        return CommonResult.success(falseAlarmResultService.selectPage(falseAlarmResultBo));
+    }
+
+    /**
+     * 导出虚警抑制结果列表
+     */
+    @SaCheckPermission("als:falseAlarmResult:export")
+    @Log(title = "虚警抑制结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public CommonResult<Void> export(FalseAlarmResultBo falseAlarmResultBo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        List<FalseAlarmResultVo> list = falseAlarmResultService.selectList(falseAlarmResultBo);
+        if (CollUtil.isEmpty(list)) {
+            return CommonResult.fail("导出列表为空");
+        }
+        falseAlarmResultService.asyncExport(list, "虚警抑制结果", loginUser);
+        return CommonResult.success();
+    }
+
+    /**
+     * 获取虚警抑制结果详细信息
+     */
+    @SaCheckPermission("als:falseAlarmResult:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<FalseAlarmResultVo> getInfo(@PathVariable Long id) {
+        return CommonResult.success(falseAlarmResultService.selectById(id));
+    }
+
+    /**
+     * 新增虚警抑制结果
+     */
+    @SaCheckPermission("als:falseAlarmResult:add")
+    @Log(title = "虚警抑制结果", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody FalseAlarmResultBo falseAlarmResultBo) {
+        boolean inserted = falseAlarmResultService.insert(falseAlarmResultBo);
+        if (!inserted) {
+            return CommonResult.fail("新增虚警抑制结果记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改虚警抑制结果
+     */
+    @SaCheckPermission("als:falseAlarmResult:edit")
+    @Log(title = "虚警抑制结果", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody FalseAlarmResultBo falseAlarmResultBo) {
+        boolean updated = falseAlarmResultService.update(falseAlarmResultBo);
+        if (!updated) {
+            return CommonResult.fail("修改虚警抑制结果记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除虚警抑制结果
+     */
+    @SaCheckPermission("als:falseAlarmResult:remove")
+    @Log(title = "虚警抑制结果", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = falseAlarmResultService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除虚警抑制结果记录失败!");
+        }
+        return CommonResult.success();
+    }
+}

als-modules/agile-assurance/src/main/java/org/eco/als/domain/FalseAlarm.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_false_alarm_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table(value = "als_false_alarm_t")
+public class FalseAlarm extends BaseEntity {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    private String aircraftNo;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @Column(isLogicDelete = true)
+    private Integer delFlag;
+
+
+}

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

@@ -0,0 +1,73 @@
+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_false_alarm_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table(value = "als_false_alarm_result_t")
+public class FalseAlarmResult extends BaseEntity {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @Id
+    private Long id;
+
+    /**
+     * 虚警抑制Id
+     */
+    private Long falseAlarmId;
+
+    /**
+     * 架次号
+     */
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    private String aircraftNo;
+
+    /**
+     * 警告代码
+     */
+    private String code;
+
+    /**
+     * 警告名称
+     */
+    private String name;
+
+    /**
+     * 警告描述
+     */
+    private String describe;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 删除标识（1删除 0未删除）
+     */
+    @Column(isLogicDelete = true)
+    private Integer delFlag;
+
+
+}

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

@@ -0,0 +1,43 @@
+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.FalseAlarm;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+/**
+ * 虚警抑制业务对象 als_false_alarm_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FalseAlarm.class, reverseConvertGenerate = false)
+public class FalseAlarmBo extends BaseEntity {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    @NotBlank(message = "架次号不能为空")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @NotBlank(message = "机号不能为空")
+    private String aircraftNo;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+
+}

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

@@ -0,0 +1,68 @@
+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.FalseAlarmResult;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+/**
+ * 虚警抑制结果业务对象 als_false_alarm_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FalseAlarmResult.class, reverseConvertGenerate = false)
+public class FalseAlarmResultBo extends BaseEntity {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 虚警抑制Id
+     */
+    @NotNull(message = "虚警抑制Id不能为空")
+    private Long falseAlarmId;
+
+    /**
+     * 架次号
+     */
+    @NotBlank(message = "架次号不能为空")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @NotBlank(message = "机号不能为空")
+    private String aircraftNo;
+
+    /**
+     * 警告代码
+     */
+    @NotBlank(message = "警告代码不能为空")
+    private String code;
+
+    /**
+     * 警告名称
+     */
+    @NotBlank(message = "警告名称不能为空")
+    private String name;
+
+    /**
+     * 警告描述
+     */
+    @NotBlank(message = "警告描述不能为空")
+    private String describe;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+
+}

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

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,78 @@
+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/FalseAlarmResultVo.java

@@ -0,0 +1,100 @@
+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.FalseAlarmResult;
+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_false_alarm_result_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FalseAlarmResult.class)
+public class FalseAlarmResultVo extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 虚警抑制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;
+
+
+    /**
+     * 创建人名称
+     */
+    @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/FalseAlarmVo.java

@@ -0,0 +1,76 @@
+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.FalseAlarm;
+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_false_alarm_t
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FalseAlarm.class)
+public class FalseAlarmVo 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;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "common_type")
+    private String status;
+
+    /**
+     * 删除标识（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/mapper/FalseAlarmMapper.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.FalseAlarm;
+
+/**
+ * 虚警抑制Mapper接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Mapper
+public interface FalseAlarmMapper extends BaseMapper<FalseAlarm> {
+
+}

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/FalseAlarmResultMapper.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.FalseAlarmResult;
+
+/**
+ * 虚警抑制结果Mapper接口
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Mapper
+public interface FalseAlarmResultMapper extends BaseMapper<FalseAlarmResult> {
+
+}

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

@@ -0,0 +1,86 @@
+package org.eco.als.service;
+
+import org.eco.als.domain.FalseAlarmResult;
+import org.eco.als.domain.bo.FalseAlarmResultBo;
+import org.eco.als.domain.vo.FalseAlarmResultVo;
+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 IFalseAlarmResultService extends IBaseService<FalseAlarmResult> {
+    /**
+     * 查询虚警抑制结果
+     *
+     * @param id 虚警抑制结果主键
+     * @return 虚警抑制结果
+     */
+    FalseAlarmResultVo selectById(Long id);
+
+    /**
+     * 查询虚警抑制结果列表
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 虚警抑制结果集合
+     */
+    List<FalseAlarmResultVo> selectList(FalseAlarmResultBo falseAlarmResultBo);
+
+    /**
+     * 分页查询虚警抑制结果列表
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 分页虚警抑制结果集合
+     */
+    PageResult<FalseAlarmResultVo> selectPage(FalseAlarmResultBo falseAlarmResultBo);
+
+    /**
+     * 新增虚警抑制结果
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insert(FalseAlarmResultBo falseAlarmResultBo);
+
+    /**
+     * 新增虚警抑制结果，前台提供主键值，一般用于导入的场合
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insertWithPk(FalseAlarmResultBo falseAlarmResultBo);
+
+    /**
+     * 修改虚警抑制结果
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    boolean update(FalseAlarmResultBo falseAlarmResultBo);
+
+    /**
+     * 批量删除虚警抑制结果
+     *
+     * @param ids 需要删除的虚警抑制结果主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    boolean deleteByIds(Long[] ids);
+
+    /**
+     * asyncExport 异步导出
+     *
+     * @param listVo    数据列表
+     * @param sheetName 文件名称
+     * @param user      上下文
+     */
+    @Async
+    void asyncExport(List<FalseAlarmResultVo> listVo, String sheetName, LoginUser user);
+
+}

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

@@ -0,0 +1,86 @@
+package org.eco.als.service;
+
+import org.eco.als.domain.FalseAlarm;
+import org.eco.als.domain.bo.FalseAlarmBo;
+import org.eco.als.domain.vo.FalseAlarmVo;
+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 IFalseAlarmService extends IBaseService<FalseAlarm> {
+    /**
+     * 查询虚警抑制
+     *
+     * @param id 虚警抑制主键
+     * @return 虚警抑制
+     */
+    FalseAlarmVo selectById(Long id);
+
+    /**
+     * 查询虚警抑制列表
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 虚警抑制集合
+     */
+    List<FalseAlarmVo> selectList(FalseAlarmBo falseAlarmBo);
+
+    /**
+     * 分页查询虚警抑制列表
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 分页虚警抑制集合
+     */
+    PageResult<FalseAlarmVo> selectPage(FalseAlarmBo falseAlarmBo);
+
+    /**
+     * 新增虚警抑制
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insert(FalseAlarmBo falseAlarmBo);
+
+    /**
+     * 新增虚警抑制，前台提供主键值，一般用于导入的场合
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insertWithPk(FalseAlarmBo falseAlarmBo);
+
+    /**
+     * 修改虚警抑制
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    boolean update(FalseAlarmBo falseAlarmBo);
+
+    /**
+     * 批量删除虚警抑制
+     *
+     * @param ids 需要删除的虚警抑制主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    boolean deleteByIds(Long[] ids);
+
+    /**
+     * asyncExport 异步导出
+     *
+     * @param listVo    数据列表
+     * @param sheetName 文件名称
+     * @param user      上下文
+     */
+    @Async
+    void asyncExport(List<FalseAlarmVo> listVo, String sheetName, LoginUser user);
+
+}

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

@@ -13,11 +13,9 @@ import org.eco.als.mapper.AircraftMapper;
 import org.eco.als.service.IAircraftService;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.core.utils.bean.BeanUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -119,17 +117,17 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
     @Override
     public boolean insertWithPk(AircraftBo aircraftBo) {
         Aircraft aircraft = MapstructUtils.convert(aircraftBo, Aircraft.class);
-
         //获取祖级列表字段
+        assert aircraft != null;
         Long parentId = aircraft.getParentId();
         if (parentId == 0) {
-            aircraft.setAncestors("0" );
+            aircraft.setAncestors("0");
         } else {
             AircraftVo parentAircraft = selectById(aircraftBo.getParentId());
             if (ObjectUtil.isNotNull(parentAircraft)) {
                 aircraft.setAncestors(parentAircraft.getAncestors() + "," + parentId);
             } else {
-                aircraft.setAncestors("0" );
+                aircraft.setAncestors("0");
             }
         }
 
@@ -146,8 +144,7 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
     public boolean update(AircraftBo aircraftBo) {
         Aircraft aircraft = MapstructUtils.convert(aircraftBo, Aircraft.class);
         if (ObjectUtil.isNotNull(aircraft) && ObjectUtil.isNotNull(aircraft.getId())) {
-            boolean updated = this.updateById(aircraft);
-            return updated;
+            return this.updateById(aircraft);
         }
         return false;
     }
@@ -161,32 +158,21 @@ public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraf
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
-            log.info("异步导入日志写入成功" );
+            log.info("异步导入日志写入成功");
         }
     }
 
     @Override
     public void asyncExport(List<AircraftVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, AircraftVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
-            log.info("异步导出日志写入成功" );
+            log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除机型机号
      *

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

@@ -15,12 +15,10 @@ import org.eco.als.service.IDataImportService;
 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.core.utils.bean.BeanUtils;
 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.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -162,8 +160,7 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -172,22 +169,12 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
     @Override
     public void asyncExport(List<DataImportVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, DataImportVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除数据导入信息
      *

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

@@ -0,0 +1,173 @@
+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.FalseAlarmResult;
+import org.eco.als.domain.bo.FalseAlarmResultBo;
+import org.eco.als.domain.vo.FalseAlarmResultVo;
+import org.eco.als.mapper.FalseAlarmResultMapper;
+import org.eco.als.service.IFalseAlarmResultService;
+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.FalseAlarmResultTableDef.FALSE_ALARM_RESULT;
+
+/**
+ * 虚警抑制结果Service业务层处理
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Service
+@Slf4j
+public class FalseAlarmResultServiceImpl extends BaseServiceImpl<FalseAlarmResultMapper, FalseAlarmResult> implements IFalseAlarmResultService {
+    @Resource
+    private FalseAlarmResultMapper falseAlarmResultMapper;
+
+    @Resource
+    private IExcelService excelService;
+
+    @Resource
+    private IImportExportService importExportService;
+
+    @Override
+    public QueryWrapper query() {
+        return super.query().from(FALSE_ALARM_RESULT);
+    }
+
+    private QueryWrapper buildQueryWrapper(FalseAlarmResultBo falseAlarmResultBo) {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.and(FALSE_ALARM_RESULT.FALSE_ALARM_ID.eq
+            (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.CODE.eq
+            (falseAlarmResultBo.getCode()));
+        queryWrapper.and(FALSE_ALARM_RESULT.NAME.like
+            (falseAlarmResultBo.getName()));
+        queryWrapper.and(FALSE_ALARM_RESULT.DESCRIBE.eq
+            (falseAlarmResultBo.getDescribe()));
+        queryWrapper.and(FALSE_ALARM_RESULT.STATUS.eq
+            (falseAlarmResultBo.getStatus()));
+
+        return queryWrapper;
+    }
+
+    /**
+     * 查询虚警抑制结果
+     *
+     * @param id 虚警抑制结果主键
+     * @return 虚警抑制结果
+     */
+    @Override
+    public FalseAlarmResultVo selectById(Long id) {
+        return this.getOneAs(query().where(FALSE_ALARM_RESULT.ID.eq(id)), FalseAlarmResultVo.class);
+
+    }
+
+
+    /**
+     * 查询虚警抑制结果列表
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 虚警抑制结果集合
+     */
+    @Override
+    public List<FalseAlarmResultVo> selectList(FalseAlarmResultBo falseAlarmResultBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(falseAlarmResultBo);
+        return this.listAs(queryWrapper, FalseAlarmResultVo.class);
+    }
+
+    /**
+     * 分页查询虚警抑制结果列表
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 分页虚警抑制结果集合
+     */
+    @Override
+    public PageResult<FalseAlarmResultVo> selectPage(FalseAlarmResultBo falseAlarmResultBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(falseAlarmResultBo);
+        Page<FalseAlarmResultVo> page = this.pageAs(PageQuery.build(), queryWrapper, FalseAlarmResultVo.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 新增虚警抑制结果
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insert(FalseAlarmResultBo falseAlarmResultBo) {
+        FalseAlarmResult falseAlarmResult = MapstructUtils.convert(falseAlarmResultBo, FalseAlarmResult.class);
+
+        return this.save(falseAlarmResult);//使用全局配置的雪花算法主键生成器生成ID值
+    }
+
+    /**
+     * 新增虚警抑制结果，前台提供主键值，一般用于导入的场合
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insertWithPk(FalseAlarmResultBo falseAlarmResultBo) {
+        FalseAlarmResult falseAlarmResult = MapstructUtils.convert(falseAlarmResultBo, FalseAlarmResult.class);
+
+
+        return falseAlarmResultMapper.insertWithPk(falseAlarmResult) > 0;//前台传来主键值
+    }
+
+    /**
+     * 修改虚警抑制结果
+     *
+     * @param falseAlarmResultBo 虚警抑制结果Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    @Override
+    public boolean update(FalseAlarmResultBo falseAlarmResultBo) {
+        FalseAlarmResult falseAlarmResult = MapstructUtils.convert(falseAlarmResultBo, FalseAlarmResult.class);
+        if (ObjectUtil.isNotNull(falseAlarmResult) && ObjectUtil.isNotNull(falseAlarmResult.getId())) {
+            return this.updateById(falseAlarmResult);
+        }
+        return false;
+    }
+
+    @Override
+    public void asyncExport(List<FalseAlarmResultVo> listVo, String sheetName, LoginUser loginUser) {
+        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FalseAlarmResultVo.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/FalseAlarmServiceImpl.java

@@ -0,0 +1,165 @@
+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.FalseAlarm;
+import org.eco.als.domain.bo.FalseAlarmBo;
+import org.eco.als.domain.vo.FalseAlarmVo;
+import org.eco.als.mapper.FalseAlarmMapper;
+import org.eco.als.service.IFalseAlarmService;
+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.FalseAlarmTableDef.FALSE_ALARM;
+
+/**
+ * 虚警抑制Service业务层处理
+ *
+ * @author wgk
+ * @date 2024-07-23
+ */
+@Service
+@Slf4j
+public class FalseAlarmServiceImpl extends BaseServiceImpl<FalseAlarmMapper, FalseAlarm> implements IFalseAlarmService {
+    @Resource
+    private FalseAlarmMapper falseAlarmMapper;
+
+    @Resource
+    private IExcelService excelService;
+
+    @Resource
+    private IImportExportService importExportService;
+
+    @Override
+    public QueryWrapper query() {
+        return super.query().from(FALSE_ALARM);
+    }
+
+    private QueryWrapper buildQueryWrapper(FalseAlarmBo falseAlarmBo) {
+        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.STATUS.eq
+            (falseAlarmBo.getStatus()));
+
+        return queryWrapper;
+    }
+
+    /**
+     * 查询虚警抑制
+     *
+     * @param id 虚警抑制主键
+     * @return 虚警抑制
+     */
+    @Override
+    public FalseAlarmVo selectById(Long id) {
+        return this.getOneAs(query().where(FALSE_ALARM.ID.eq(id)), FalseAlarmVo.class);
+
+    }
+
+
+    /**
+     * 查询虚警抑制列表
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 虚警抑制集合
+     */
+    @Override
+    public List<FalseAlarmVo> selectList(FalseAlarmBo falseAlarmBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(falseAlarmBo);
+        return this.listAs(queryWrapper, FalseAlarmVo.class);
+    }
+
+    /**
+     * 分页查询虚警抑制列表
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 分页虚警抑制集合
+     */
+    @Override
+    public PageResult<FalseAlarmVo> selectPage(FalseAlarmBo falseAlarmBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(falseAlarmBo);
+        Page<FalseAlarmVo> page = this.pageAs(PageQuery.build(), queryWrapper, FalseAlarmVo.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 新增虚警抑制
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insert(FalseAlarmBo falseAlarmBo) {
+        FalseAlarm falseAlarm = MapstructUtils.convert(falseAlarmBo, FalseAlarm.class);
+
+        return this.save(falseAlarm);//使用全局配置的雪花算法主键生成器生成ID值
+    }
+
+    /**
+     * 新增虚警抑制，前台提供主键值，一般用于导入的场合
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insertWithPk(FalseAlarmBo falseAlarmBo) {
+        FalseAlarm falseAlarm = MapstructUtils.convert(falseAlarmBo, FalseAlarm.class);
+
+
+        return falseAlarmMapper.insertWithPk(falseAlarm) > 0;//前台传来主键值
+    }
+
+    /**
+     * 修改虚警抑制
+     *
+     * @param falseAlarmBo 虚警抑制Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    @Override
+    public boolean update(FalseAlarmBo falseAlarmBo) {
+        FalseAlarm falseAlarm = MapstructUtils.convert(falseAlarmBo, FalseAlarm.class);
+        if (ObjectUtil.isNotNull(falseAlarm) && ObjectUtil.isNotNull(falseAlarm.getId())) {
+            return this.updateById(falseAlarm);
+        }
+        return false;
+    }
+
+    @Override
+    public void asyncExport(List<FalseAlarmVo> listVo, String sheetName, LoginUser loginUser) {
+        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FalseAlarmVo.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/MaintenanceRecordServiceImpl.java

@@ -15,12 +15,10 @@ import org.eco.als.service.IMaintenanceRecordService;
 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.core.utils.bean.BeanUtils;
 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.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -194,8 +192,7 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
     public boolean update(MaintenanceRecordBo maintenanceRecordBo) {
         MaintenanceRecord maintenanceRecord = MapstructUtils.convert(maintenanceRecordBo, MaintenanceRecord.class);
         if (ObjectUtil.isNotNull(maintenanceRecord) && ObjectUtil.isNotNull(maintenanceRecord.getId())) {
-            boolean updated = this.updateById(maintenanceRecord);
-            return updated;
+            return this.updateById(maintenanceRecord);
         }
         return false;
     }
@@ -209,8 +206,7 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -219,22 +215,12 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
     @Override
     public void asyncExport(List<MaintenanceRecordVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, MaintenanceRecordVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除维修记录
      *

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

@@ -15,12 +15,10 @@ import org.eco.als.service.IModelService;
 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.core.utils.bean.BeanUtils;
 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.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -140,8 +138,7 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelMapper, Model> implem
     public boolean update(ModelBo modelBo) {
         Model model = MapstructUtils.convert(modelBo, Model.class);
         if (ObjectUtil.isNotNull(model) && ObjectUtil.isNotNull(model.getId())) {
-            boolean updated = this.updateById(model);
-            return updated;
+            return this.updateById(model);
         }
         return false;
     }
@@ -155,8 +152,7 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelMapper, Model> implem
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -165,22 +161,12 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelMapper, Model> implem
     @Override
     public void asyncExport(List<ModelVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, ModelVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除模型信息
      *

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

@@ -15,12 +15,10 @@ import org.eco.als.service.IPreProcessingService;
 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.core.utils.bean.BeanUtils;
 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.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -158,8 +156,7 @@ public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMappe
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -168,22 +165,12 @@ public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMappe
     @Override
     public void asyncExport(List<PreProcessingVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, PreProcessingVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除预处理
      *

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

@@ -13,11 +13,9 @@ import org.eco.als.mapper.ProductMapper;
 import org.eco.als.service.IProductService;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.core.utils.bean.BeanUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -182,8 +180,7 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, Product>
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -192,22 +189,12 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, Product>
     @Override
     public void asyncExport(List<ProductVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, ProductVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除产品树
      *

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

@@ -1,35 +1,33 @@
 package org.eco.als.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 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.Warning;
+import org.eco.als.domain.bo.WarningBo;
+import org.eco.als.domain.vo.WarningImportVo;
+import org.eco.als.domain.vo.WarningVo;
+import org.eco.als.listener.WarningImportListener;
+import org.eco.als.mapper.WarningMapper;
+import org.eco.als.service.IWarningService;
 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.core.utils.bean.BeanUtils;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.system.service.IImportExportService;
-import org.eco.common.core.utils.StringUtils;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.common.orm.core.page.PageQuery;
-import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
+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 org.eco.als.mapper.WarningMapper;
-import org.eco.als.domain.Warning;
-import org.eco.als.domain.bo.WarningBo;
-import org.eco.als.domain.vo.WarningVo;
-import org.eco.als.domain.vo.WarningImportVo;
-import org.eco.als.listener.WarningImportListener;
-import org.eco.als.service.IWarningService;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.eco.als.domain.table.WarningTableDef.WARNING;
 
 /**
@@ -58,15 +56,15 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
     private QueryWrapper buildQueryWrapper(WarningBo warningBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(WARNING.SORTIE_NO.eq
-        (warningBo.getSortieNo()));
+            (warningBo.getSortieNo()));
         queryWrapper.and(WARNING.AIRCRAFT_NO.eq
-        (warningBo.getAircraftNo()));
+            (warningBo.getAircraftNo()));
         queryWrapper.and(WARNING.CODE.eq
-        (warningBo.getCode()));
+            (warningBo.getCode()));
         queryWrapper.and(WARNING.NAME.like
-        (warningBo.getName()));
+            (warningBo.getName()));
         queryWrapper.and(WARNING.DESCRIBE.eq
-        (warningBo.getDescribe()));
+            (warningBo.getDescribe()));
 
         return queryWrapper;
     }
@@ -79,7 +77,7 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
      */
     @Override
     public WarningVo selectById(Long id) {
-            return this.getOneAs(query().where(WARNING.ID.eq(id)), WarningVo.class);
+        return this.getOneAs(query().where(WARNING.ID.eq(id)), WarningVo.class);
 
     }
 
@@ -93,7 +91,7 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
     @Override
     public List<WarningVo> selectList(WarningBo warningBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(warningBo);
-            return this.listAs(queryWrapper, WarningVo.class);
+        return this.listAs(queryWrapper, WarningVo.class);
     }
 
     /**
@@ -105,7 +103,7 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
     @Override
     public PageResult<WarningVo> selectPage(WarningBo warningBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(warningBo);
-            Page<WarningVo> page = this.pageAs(PageQuery.build(), queryWrapper, WarningVo.class);
+        Page<WarningVo> page = this.pageAs(PageQuery.build(), queryWrapper, WarningVo.class);
         return PageResult.build(page);
     }
 
@@ -117,7 +115,7 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
      */
     @Override
     public boolean insert(WarningBo warningBo) {
-    Warning warning =MapstructUtils.convert(warningBo, Warning. class);
+        Warning warning = MapstructUtils.convert(warningBo, Warning.class);
 
         return this.save(warning);//使用全局配置的雪花算法主键生成器生成ID值
     }
@@ -129,12 +127,11 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
      * @return 结果:true 操作成功，false 操作失败
      */
     @Override
-    public boolean insertWithPk(WarningBo warningBo)
-    {
+    public boolean insertWithPk(WarningBo warningBo) {
         Warning warning = MapstructUtils.convert(warningBo, Warning.class);
 
 
-            return warningMapper.insertWithPk(warning) > 0;//前台传来主键值
+        return warningMapper.insertWithPk(warning) > 0;//前台传来主键值
     }
 
     /**
@@ -145,10 +142,9 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
      */
     @Override
     public boolean update(WarningBo warningBo) {
-        Warning warning =MapstructUtils.convert(warningBo, Warning. class);
-        if (ObjectUtil.isNotNull(warning) && ObjectUtil.isNotNull(warning.getId())){
-            boolean updated = this.updateById(warning);
-                return updated;
+        Warning warning = MapstructUtils.convert(warningBo, Warning.class);
+        if (ObjectUtil.isNotNull(warning) && ObjectUtil.isNotNull(warning.getId())) {
+            return this.updateById(warning);
         }
         return false;
     }
@@ -162,8 +158,7 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -172,22 +167,12 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
     @Override
     public void asyncExport(List<WarningVo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, WarningVo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除警告信息
      *

als-modules/agile-assurance/src/main/resources/mapper/als/FalseAlarmMapper.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.FalseAlarmMapper">
+
+</mapper>

als-modules/agile-assurance/src/main/resources/mapper/als/FalseAlarmResultMapper.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.FalseAlarmResultMapper">
+
+</mapper>

als-modules/generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.controller;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -19,10 +20,10 @@ import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.service.I${ClassName}Service;
 import org.springframework.web.multipart.MultipartFile;
-#if($table.crud || $table.sub)
-import org.eco.common.core.core.page.PageResult;
-#elseif($table.tree)
-#end
+    #if($table.crud || $table.sub)
+    import org.eco.common.core.core.page.PageResult;
+    #elseif($table.tree)
+    #end
 
 import java.util.List;
 import java.util.ArrayList;
@@ -41,20 +42,20 @@ public class ${ClassName}Controller extends BaseController {
     @Resource
     private I${ClassName}Service ${className}Service;
 
-    /**
-     * 查询${functionName}列表
-     */
-    @SaCheckPermission("${permissionPrefix}:list")
-    @GetMapping("/list")
+/**
+ * 查询${functionName}列表
+ */
+@SaCheckPermission("${permissionPrefix}:list")
+@GetMapping("/list")
     #if($table.crud || $table.sub)
     public CommonResult<PageResult<${ClassName}Vo>> list(${ClassName}Bo ${className}Bo) {
         return CommonResult.success(${className}Service.selectPage(${className}Bo));
     }
     #elseif($table.tree)
-    public CommonResult<List<${ClassName}Vo>> list(${ClassName}Bo ${className}Bo) {
-        List<${ClassName}Vo> list = ${className}Service.selectList(${className}Bo);
-        return CommonResult.success(list);
-    }
+        public CommonResult<List<${ClassName}Vo>> list(${ClassName}Bo ${className}Bo) {
+            List<${ClassName}Vo> list = ${className}Service.selectList(${className}Bo);
+            return CommonResult.success(list);
+        }
     #end
 
     /**
@@ -63,10 +64,13 @@ public class ${ClassName}Controller extends BaseController {
     @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public CommonResult<Void> export(HttpServletResponse response, ${ClassName}Bo ${className}Bo) {
+    public CommonResult<Void> export(${ClassName}Bo ${className}Bo) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         List<${ClassName}Vo> list = ${className}Service.selectList(${className}Bo);
-        ${className}Service.asyncExport(list, "${functionName}", loginUser);
+        if (CollUtil.isEmpty(list)) {
+            return CommonResult.fail("导出列表为空");
+        }
+            ${className}Service.asyncExport(list, "${functionName}", loginUser);
         return CommonResult.success();
     }
 
@@ -84,7 +88,7 @@ public class ${ClassName}Controller extends BaseController {
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
-        ${className}Service.asyncImportData(file, updateSupport, loginUser);
+            ${className}Service.asyncImportData(file, updateSupport, loginUser);
         return CommonResult.success();
     }
 

als-modules/generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -264,8 +264,7 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "0");
         if (flag) {
             log.info("异步导入日志写入成功");
         }
@@ -274,22 +273,12 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
     @Override
     public void asyncExport(List<${ClassName}Vo> listVo, String sheetName, LoginUser loginUser) {
         ExcelResultRes result = excelService.exportExcel(listVo, sheetName, ${ClassName}Vo.class);
-        ImportExportBo bo = getImportExportBo(result, loginUser, "1");
-        boolean flag = importExportService.insert(bo);
+        boolean flag = importExportService.saveInfo(result, loginUser, "1");
         if (flag) {
             log.info("异步导出日志写入成功");
         }
     }
 
-    private static ImportExportBo getImportExportBo(ExcelResultRes result, LoginUser loginUser, String type) {
-        ImportExportBo bo = new ImportExportBo();
-        BeanUtils.copyProperties(result, bo);
-        bo.setUpdateBy(loginUser.getUserId());
-        bo.setCreateBy(loginUser.getUserId());
-        bo.setType(type);
-        return bo;
-    }
-
     /**
      * 批量删除${functionName}
      *

als-modules/system/src/main/java/org/eco/system/service/IImportExportService.java

@@ -1,5 +1,6 @@
 package org.eco.system.service;
 
+import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.orm.core.service.IBaseService;
@@ -51,10 +52,10 @@ public interface IImportExportService extends IBaseService<ImportExport> {
     /**
      * 新增导入导出日志
      *
-     * @param resultRes 导入导出日志
-     * @param type      导入导出类型
+     * @param result 导入导出日志
+     * @param type   导入导出类型
      * @return 结果:true 操作成功，false 操作失败
      */
-    boolean saveInfo(ExcelResultRes resultRes, String type);
+    boolean saveInfo(ExcelResultRes result, LoginUser loginUser, String type);
 
 }

als-modules/system/src/main/java/org/eco/system/service/impl/ImportExportServiceImpl.java

@@ -2,8 +2,10 @@ package org.eco.system.service.impl;
 
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+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.core.utils.bean.BeanUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
@@ -13,7 +15,6 @@ import org.eco.system.domain.vo.ImportExportVo;
 import org.eco.system.mapper.ImportExportMapper;
 import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -93,16 +94,13 @@ public class ImportExportServiceImpl extends BaseServiceImpl<ImportExportMapper,
     }
 
     @Override
-    @Transactional
-    public boolean saveInfo(ExcelResultRes resultRes, String type) {
-        ImportExportBo importExportBo = new ImportExportBo();
-        importExportBo.setOssId(resultRes.getOssId());
-        importExportBo.setUrl(resultRes.getUrl());
-        importExportBo.setType(type); // 导入
-        importExportBo.setStatus(resultRes.getStatus());
-        importExportBo.setName(resultRes.getName());
-        importExportBo.setLogInfo(resultRes.getLogInfo());
-        ImportExport importExport = MapstructUtils.convert(importExportBo, ImportExport.class);
+    public boolean saveInfo(ExcelResultRes result, LoginUser loginUser, String type) {
+        ImportExportBo bo = new ImportExportBo();
+        BeanUtils.copyProperties(result, bo);
+        bo.setUpdateBy(loginUser.getUserId());
+        bo.setCreateBy(loginUser.getUserId());
+        bo.setType(type);
+        ImportExport importExport = MapstructUtils.convert(bo, ImportExport.class);
         return this.save(importExport);//使用全局配置的雪花算法主键生成器生成ID值
     }