预处理

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

@@ -0,0 +1,140 @@
+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;
+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 org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 预处理Controller
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/als/preProcessing")
+public class PreProcessingController extends BaseController {
+    @Resource
+    private IPreProcessingService preProcessingService;
+
+    /**
+     * 查询预处理列表
+     */
+    @SaCheckPermission("als:preProcessing:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<PreProcessingVo>> list(PreProcessingBo preProcessingBo) {
+        return CommonResult.success(preProcessingService.selectPage(preProcessingBo));
+    }
+
+    /**
+     * 导出预处理列表
+     */
+    @SaCheckPermission("als:preProcessing:export")
+    @Log(title = "预处理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public CommonResult<Void> export(PreProcessingBo preProcessingBo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        List<PreProcessingVo> list = preProcessingService.selectList(preProcessingBo);
+        preProcessingService.asyncExport(list, "预处理", loginUser);
+        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();
+    }
+
+    /**
+     * 获取预处理详细信息
+     */
+    @SaCheckPermission("als:preProcessing:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<PreProcessingVo> getInfo(@PathVariable Long id) {
+        return CommonResult.success(preProcessingService.selectById(id));
+    }
+
+    /**
+     * 新增预处理
+     */
+    @SaCheckPermission("als:preProcessing:add")
+    @Log(title = "预处理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody PreProcessingBo preProcessingBo) {
+        boolean inserted = preProcessingService.insert(preProcessingBo);
+        if (!inserted) {
+            return CommonResult.fail("新增预处理记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改预处理
+     */
+    @SaCheckPermission("als:preProcessing:edit")
+    @Log(title = "预处理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody PreProcessingBo preProcessingBo) {
+        boolean updated = preProcessingService.update(preProcessingBo);
+        if (!updated) {
+            return CommonResult.fail("修改预处理记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除预处理
+     */
+    @SaCheckPermission("als:preProcessing:remove")
+    @Log(title = "预处理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = preProcessingService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除预处理记录失败!");
+        }
+        return CommonResult.success();
+    }
+}

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

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

@@ -1,10 +1,10 @@
 package org.eco.als.domain.bo;
 
-import org.eco.als.domain.Model;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.eco.als.domain.Model;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 /**
@@ -16,7 +16,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Model.class, reverseConvertGenerate = false)
-public class ModelBo extends BaseEntity{
+public class ModelBo extends BaseEntity {
     /**
      * 编号
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/PreProcessingBo.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.PreProcessing;
+import org.eco.common.orm.core.domain.BaseEntity;
+
+/**
+ * 预处理业务对象 als_pre_processing_t
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PreProcessing.class, reverseConvertGenerate = false)
+public class PreProcessingBo extends BaseEntity {
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 架次号
+     */
+    @NotBlank(message = "架次号不能为空")
+    private String sortieNo;
+
+    /**
+     * 机号
+     */
+    @NotBlank(message = "机号不能为空")
+    private String aircraftNo;
+
+    /**
+     * 文件Id
+     */
+    @NotNull(message = "文件Id不能为空")
+    private Long ossId;
+
+    /**
+     * 状态
+     */
+    @NotBlank(message = "状态不能为空")
+    private String status;
+
+
+}

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

@@ -1,6 +1,5 @@
 package org.eco.als.domain.bo;
 
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -21,7 +20,6 @@ public class ProductBo extends TreeEntity {
     /**
      * 编号
      */
-    @Id
     private Long id;
 
     /**

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

@@ -0,0 +1,61 @@
+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/domain/vo/PreProcessingVo.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.PreProcessing;
+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_pre_processing_t
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PreProcessing.class)
+public class PreProcessingVo 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;
+
+    /**
+     * 文件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;
+
+
+    /**
+     * 创建人名称
+     */
+    @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/listener/PreProcessingImportListener.java

@@ -0,0 +1,127 @@
+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/PreProcessingMapper.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.PreProcessing;
+
+/**
+ * 预处理Mapper接口
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+@Mapper
+public interface PreProcessingMapper extends BaseMapper<PreProcessing> {
+
+}

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

@@ -0,0 +1,97 @@
+package org.eco.als.service;
+
+import org.eco.als.domain.PreProcessing;
+import org.eco.als.domain.bo.PreProcessingBo;
+import org.eco.als.domain.vo.PreProcessingVo;
+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;
+
+/**
+ * 预处理Service接口
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+public interface IPreProcessingService extends IBaseService<PreProcessing> {
+    /**
+     * 查询预处理
+     *
+     * @param id 预处理主键
+     * @return 预处理
+     */
+    PreProcessingVo selectById(Long id);
+
+    /**
+     * 查询预处理列表
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 预处理集合
+     */
+    List<PreProcessingVo> selectList(PreProcessingBo preProcessingBo);
+
+    /**
+     * 分页查询预处理列表
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 分页预处理集合
+     */
+    PageResult<PreProcessingVo> selectPage(PreProcessingBo preProcessingBo);
+
+    /**
+     * 新增预处理
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insert(PreProcessingBo preProcessingBo);
+
+    /**
+     * 新增预处理，前台提供主键值，一般用于导入的场合
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    boolean insertWithPk(PreProcessingBo preProcessingBo);
+
+    /**
+     * 修改预处理
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    boolean update(PreProcessingBo preProcessingBo);
+
+    /**
+     * 批量删除预处理
+     *
+     * @param ids 需要删除的预处理主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    boolean deleteByIds(Long[] ids);
+
+    /**
+     * 异步导入
+     *
+     * @param file          导入的文件
+     * @param updateSupport 是否覆盖
+     * @param user          用户上下文信息
+     */
+    @Async
+    void asyncImportData(MultipartFile file, boolean updateSupport, LoginUser user);
+
+    /**
+     * asyncExport 异步导出
+     *
+     * @param listVo    数据列表
+     * @param sheetName 文件名称
+     * @param user      上下文
+     */
+    @Async
+    void asyncExport(List<PreProcessingVo> listVo, String sheetName, LoginUser user);
+
+}

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

@@ -0,0 +1,199 @@
+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.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;
+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;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.eco.als.domain.table.PreProcessingTableDef.PRE_PROCESSING;
+
+/**
+ * 预处理Service业务层处理
+ *
+ * @author wgk
+ * @date 2024-07-22
+ */
+@Service
+@Slf4j
+public class PreProcessingServiceImpl extends BaseServiceImpl<PreProcessingMapper, PreProcessing> implements IPreProcessingService {
+    @Resource
+    private PreProcessingMapper preProcessingMapper;
+
+    @Resource
+    private IExcelService excelService;
+
+    @Resource
+    private IImportExportService importExportService;
+
+    @Override
+    public QueryWrapper query() {
+        return super.query().from(PRE_PROCESSING);
+    }
+
+    private QueryWrapper buildQueryWrapper(PreProcessingBo preProcessingBo) {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.and(PRE_PROCESSING.SORTIE_NO.eq
+            (preProcessingBo.getSortieNo()));
+        queryWrapper.and(PRE_PROCESSING.AIRCRAFT_NO.eq
+            (preProcessingBo.getAircraftNo()));
+        queryWrapper.and(PRE_PROCESSING.OSS_ID.eq
+            (preProcessingBo.getOssId()));
+        queryWrapper.and(PRE_PROCESSING.STATUS.eq
+            (preProcessingBo.getStatus()));
+
+        return queryWrapper;
+    }
+
+    /**
+     * 查询预处理
+     *
+     * @param id 预处理主键
+     * @return 预处理
+     */
+    @Override
+    public PreProcessingVo selectById(Long id) {
+        return this.getOneAs(query().where(PRE_PROCESSING.ID.eq(id)), PreProcessingVo.class);
+
+    }
+
+
+    /**
+     * 查询预处理列表
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 预处理集合
+     */
+    @Override
+    public List<PreProcessingVo> selectList(PreProcessingBo preProcessingBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(preProcessingBo);
+        return this.listAs(queryWrapper, PreProcessingVo.class);
+    }
+
+    /**
+     * 分页查询预处理列表
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 分页预处理集合
+     */
+    @Override
+    public PageResult<PreProcessingVo> selectPage(PreProcessingBo preProcessingBo) {
+        QueryWrapper queryWrapper = buildQueryWrapper(preProcessingBo);
+        Page<PreProcessingVo> page = this.pageAs(PageQuery.build(), queryWrapper, PreProcessingVo.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 新增预处理
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insert(PreProcessingBo preProcessingBo) {
+        PreProcessing preProcessing = MapstructUtils.convert(preProcessingBo, PreProcessing.class);
+
+        return this.save(preProcessing);//使用全局配置的雪花算法主键生成器生成ID值
+    }
+
+    /**
+     * 新增预处理，前台提供主键值，一般用于导入的场合
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 操作成功，false 操作失败
+     */
+    @Override
+    public boolean insertWithPk(PreProcessingBo preProcessingBo) {
+        PreProcessing preProcessing = MapstructUtils.convert(preProcessingBo, PreProcessing.class);
+
+
+        return preProcessingMapper.insertWithPk(preProcessing) > 0;//前台传来主键值
+    }
+
+    /**
+     * 修改预处理
+     *
+     * @param preProcessingBo 预处理Bo
+     * @return 结果:true 更新成功，false 更新失败
+     */
+    @Override
+    public boolean update(PreProcessingBo preProcessingBo) {
+        PreProcessing preProcessing = MapstructUtils.convert(preProcessingBo, PreProcessing.class);
+        if (ObjectUtil.isNotNull(preProcessing) && ObjectUtil.isNotNull(preProcessing.getId())) {
+            return this.updateById(preProcessing);
+        }
+        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);
+        }
+        ImportExportBo bo = getImportExportBo(result, loginUser, "0");
+        boolean flag = importExportService.insert(bo);
+        if (flag) {
+            log.info("异步导入日志写入成功");
+        }
+    }
+
+    @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);
+        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;
+    }
+
+    /**
+     * 批量删除预处理
+     *
+     * @param ids 需要删除的预处理主键集合
+     * @return 结果:true 删除成功，false 删除失败
+     */
+    @Transactional
+    @Override
+    public boolean deleteByIds(Long[] ids) {
+        return this.removeByIds(Arrays.asList(ids));
+    }
+
+}

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