Gaokun Wang пре 7 месеци
родитељ
комит
391e230b1d

+ 0 - 17
als-common/common-core/src/main/java/org/eco/common/core/service/AircraftService.java

@@ -1,17 +0,0 @@
-package org.eco.common.core.service;
-
-/**
- * @Description: AircraftService
- * @Author: GaoKun Wang
- * @Date: 2024/7/29
- */
-public interface AircraftService {
-
-    /**
-     * 通过机号ID查询机号
-     *
-     * @param aircraftId 机号ID
-     * @return 机号
-     */
-    String selectAircraftNoById(Long aircraftId);
-}

+ 0 - 26
als-common/common-mapper/src/main/java/com/eco/common/mapper/core/impl/AircraftNoMapperImpl.java

@@ -1,26 +0,0 @@
-package com.eco.common.mapper.core.impl;
-
-import com.eco.common.mapper.annotation.FieldMapperType;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.core.FieldMapperInterface;
-import lombok.AllArgsConstructor;
-import org.eco.common.core.service.AircraftService;
-
-/**
- * @Description: AircraftNoMapperImpl
- * @Author: GaoKun Wang
- * @Date: 2024/7/29
- */
-@AllArgsConstructor
-@FieldMapperType(type = MapperConstant.AIRCRAFT_ID_TO_NO)
-public class AircraftNoMapperImpl implements FieldMapperInterface<String> {
-    private final AircraftService aircraftService;
-
-    @Override
-    public String fieldMapper(Object key, String other) {
-        if (key instanceof Long id) {
-            return aircraftService.selectAircraftNoById(id);
-        }
-        return null;
-    }
-}

+ 0 - 148
als-modules/agile-assurance/src/main/java/org/eco/als/controller/AircraftController.java

@@ -1,148 +0,0 @@
-package org.eco.als.controller;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.lang.tree.Tree;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import org.eco.als.domain.bo.AircraftBo;
-import org.eco.als.domain.vo.AircraftImportVo;
-import org.eco.als.domain.vo.AircraftVo;
-import org.eco.als.service.IAircraftService;
-import org.eco.common.core.core.domain.CommonResult;
-import org.eco.common.core.core.domain.model.LoginUser;
-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-18
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/als/aircraft")
-public class AircraftController extends BaseController {
-    @Resource
-    private IAircraftService aircraftService;
-
-    /**
-     * 查询机型机号列表
-     */
-    @SaCheckPermission("als:aircraft:list")
-    @GetMapping("/list")
-    public CommonResult<List<AircraftVo>> list(AircraftBo aircraftBo) {
-        List<AircraftVo> list = aircraftService.selectList(aircraftBo);
-        return CommonResult.success(list);
-    }
-
-    @SaCheckPermission("als:aircraft:list")
-    @GetMapping("/tree")
-    public CommonResult<List<Tree<Long>>> tree(AircraftBo aircraftBo) {
-        List<Tree<Long>> list = aircraftService.selectTree(aircraftBo);
-        return CommonResult.success(list);
-    }
-
-    /**
-     * 导出机型机号列表
-     */
-    @SaCheckPermission("als:aircraft:export")
-    @Log(title = "机型机号", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public CommonResult<Void> export(AircraftBo aircraftBo) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        List<AircraftVo> list = aircraftService.selectList(aircraftBo);
-        aircraftService.asyncExport(list, "机型机号", loginUser);
-        return CommonResult.success();
-    }
-
-    @SaCheckPermission("als:aircraft:import")
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) {
-        ExcelUtil.exportExcel(new ArrayList<>(), "机型机号", AircraftImportVo.class, response);
-    }
-
-    /**
-     * 导入机型机号列表
-     */
-    @Log(title = "机型机号", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("als:aircraft:import")
-    @PostMapping("/importData")
-    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        aircraftService.asyncImportData(file, updateSupport, loginUser);
-        return CommonResult.success();
-    }
-
-    /**
-     * 获取机型机号详细信息
-     */
-    @SaCheckPermission("als:aircraft:query")
-    @GetMapping(value = "/{id}")
-    public CommonResult<AircraftVo> getInfo(@PathVariable Long id) {
-        return CommonResult.success(aircraftService.selectById(id));
-    }
-
-    /**
-     * 新增机型机号
-     */
-    @SaCheckPermission("als:aircraft:add")
-    @Log(title = "机型机号", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping
-    public CommonResult<Void> add(@Validated @RequestBody AircraftBo aircraftBo) {
-        boolean inserted = aircraftService.insert(aircraftBo);
-        if (!inserted) {
-            return CommonResult.fail("新增机型机号记录失败!");
-        }
-        return CommonResult.success();
-    }
-
-    /**
-     * 修改机型机号
-     */
-    @SaCheckPermission("als:aircraft:edit")
-    @Log(title = "机型机号", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping
-    public CommonResult<Void> edit(@Validated @RequestBody AircraftBo aircraftBo) {
-        boolean updated = aircraftService.update(aircraftBo);
-        if (!updated) {
-            return CommonResult.fail("修改机型机号记录失败!");
-        }
-        return CommonResult.success();
-    }
-
-    /**
-     * 删除机型机号
-     */
-    @SaCheckPermission("als:aircraft:remove")
-    @Log(title = "机型机号", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public CommonResult<Void> remove(@PathVariable Long[] ids) {
-        boolean deleted = aircraftService.deleteByIds(ids);
-        if (!deleted) {
-            return CommonResult.fail("删除机型机号记录失败!");
-        }
-        return CommonResult.success();
-    }
-}

+ 0 - 43
als-modules/agile-assurance/src/main/java/org/eco/als/domain/Aircraft.java

@@ -1,43 +0,0 @@
-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.TreeEntity;
-
-import java.io.Serial;
-
-/**
- * 机型机号对象 als_aircraft_t
- *
- * @author wgk
- * @date 2024-07-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Table(value = "als_aircraft_t")
-public class Aircraft extends TreeEntity {
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @Id
-    private Long id;
-
-    /**
-     * 机型/机号
-     */
-    private String name;
-
-    /**
-     * 删除标识(1删除 0未删除)
-     */
-    @Column(isLogicDelete = true)
-    private Integer delFlag;
-
-
-}

+ 0 - 32
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AircraftBo.java

@@ -1,32 +0,0 @@
-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.Aircraft;
-import org.eco.common.orm.core.domain.TreeEntity;
-
-/**
- * 机型机号业务对象 als_aircraft_t
- *
- * @author wgk
- * @date 2024-07-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Aircraft.class, reverseConvertGenerate = false)
-public class AircraftBo extends TreeEntity {
-    /**
-     * 编号
-     */
-    private Long id;
-
-    /**
-     * 机型/机号
-     */
-    @NotBlank(message = "机型/机号不能为空")
-    private String name;
-
-
-}

+ 0 - 54
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AircraftVo.java

@@ -1,54 +0,0 @@
-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.Aircraft;
-import org.eco.common.orm.core.domain.TreeEntity;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 机型机号视图对象 als_aircraft_t
- *
- * @author wgk
- * @date 2024-07-18
- */
-@Data
-@ExcelIgnoreUnannotated
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Aircraft.class)
-public class AircraftVo extends TreeEntity implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    private Long id;
-
-    /**
-     * 机型/机号
-     */
-    @ExcelProperty(value = "机型/机号")
-    private String name;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
-
-}

+ 0 - 130
als-modules/agile-assurance/src/main/java/org/eco/als/listener/AircraftImportListener.java

@@ -1,130 +0,0 @@
-package org.eco.als.listener;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.mybatisflex.core.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.eco.als.domain.bo.AircraftBo;
-import org.eco.als.domain.vo.AircraftImportVo;
-import org.eco.als.domain.vo.AircraftVo;
-import org.eco.als.service.IAircraftService;
-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 AircraftImportListener extends AnalysisEventListener<AircraftImportVo> implements ExcelListener<AircraftImportVo> {
-    private final IAircraftService aircraftService;
-
-    private final Boolean isUpdateSupport;
-    private final LoginUser loginUser;
-    private final StringBuilder successMsg = new StringBuilder();
-    private final StringBuilder failureMsg = new StringBuilder();
-    private int successNum = 0;
-    private int failureNum = 0;
-
-    public AircraftImportListener(Boolean isUpdateSupport, LoginUser loginUser) {
-        this.aircraftService = SpringUtils.getBean(IAircraftService.class);
-        this.isUpdateSupport = isUpdateSupport;
-        this.loginUser = loginUser;
-    }
-
-    @Override
-    public void invoke(AircraftImportVo aircraftVo, AnalysisContext context) {
-        try {
-            AircraftBo aircraftBo = BeanUtil.toBean(aircraftVo, AircraftBo.class);
-            QueryWrapper queryWrapper = QueryWrapper.create();
-            queryWrapper.where("name = ?", aircraftBo.getName());
-            queryWrapper.and("parent_name = ?", aircraftBo.getParentName());
-            queryWrapper.or("(name = ?", aircraftBo.getName()).and("parent_id = ?)", 0);
-            AircraftVo aircraftVo1 = aircraftService.getOneAs(queryWrapper, AircraftVo.class);
-            AircraftVo pAircraftVo = aircraftService.selectByName(aircraftBo.getParentName());
-            if (ObjectUtil.isNull(aircraftVo1)) {
-                //不存在就新增
-                setBo(aircraftBo);
-                aircraftBo.setParentId(ObjectUtil.isNull(pAircraftVo) ? 0 : pAircraftVo.getId());
-                aircraftBo.setParentName(ObjectUtil.isNull(pAircraftVo) ? "" : pAircraftVo.getName());
-                ValidatorUtils.validate(aircraftBo);
-                boolean inserted = aircraftService.insert(aircraftBo);//树表需要前台传来主键值
-                if (inserted) {
-                    successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、机型机号 记录导入成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>").append(failureNum).append("、机型机号 记录导入失败");
-                }
-            } else if (isUpdateSupport) {
-                //存在就更新
-                aircraftBo.setId(aircraftVo1.getId());
-                aircraftBo.setVersion(aircraftVo1.getVersion());
-                boolean updated = aircraftService.update(aircraftBo);
-                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(AircraftBo aircraftBo) {
-        aircraftBo.setVersion(0);
-        aircraftBo.setCreateBy(loginUser.getUserId());
-        aircraftBo.setUpdateBy(loginUser.getUserId());
-        aircraftBo.setTenantId(loginUser.getTenantId());
-    }
-
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        log.info("解析完成");
-    }
-
-    @Override
-    public ExcelResult<AircraftImportVo> 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<AircraftImportVo> getList() {
-                return null;
-            }
-
-            @Override
-            public List<String> getErrorList() {
-                return null;
-            }
-        };
-    }
-}

+ 0 - 16
als-modules/agile-assurance/src/main/java/org/eco/als/mapper/AircraftMapper.java

@@ -1,16 +0,0 @@
-package org.eco.als.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.eco.als.domain.Aircraft;
-
-/**
- * 机型机号Mapper接口
- *
- * @author wgk
- * @date 2024-07-18
- */
-@Mapper
-public interface AircraftMapper extends BaseMapper<Aircraft> {
-
-}

+ 0 - 114
als-modules/agile-assurance/src/main/java/org/eco/als/service/IAircraftService.java

@@ -1,114 +0,0 @@
-package org.eco.als.service;
-
-import cn.hutool.core.lang.tree.Tree;
-import org.eco.als.domain.Aircraft;
-import org.eco.als.domain.bo.AircraftBo;
-import org.eco.als.domain.vo.AircraftVo;
-import org.eco.common.core.core.domain.model.LoginUser;
-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-18
- */
-public interface IAircraftService extends IBaseService<Aircraft> {
-    /**
-     * 查询机型机号
-     *
-     * @param id 机型机号主键
-     * @return 机型机号
-     */
-    AircraftVo selectById(Long id);
-
-    /**
-     * 查询机型机号
-     *
-     * @param name 机型机号
-     * @return 机型机号
-     */
-    AircraftVo selectByName(String name);
-
-    /**
-     * 查询机型机号列表
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 机型机号集合
-     */
-    List<AircraftVo> selectList(AircraftBo aircraftBo);
-
-    /**
-     * 查询机型机号树表
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 机型机号集合
-     */
-    List<Tree<Long>> selectTree(AircraftBo aircraftBo);
-
-    /**
-     * 构建前端所需要下拉树结构
-     *
-     * @param list 机型机号列表
-     * @return 机型机号集合
-     */
-    List<Tree<Long>> buildTree(List<AircraftVo> list);
-
-
-    /**
-     * 新增机型机号
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 操作成功,false 操作失败
-     */
-    boolean insert(AircraftBo aircraftBo);
-
-    /**
-     * 新增机型机号,前台提供主键值,一般用于导入的场合
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 操作成功,false 操作失败
-     */
-    boolean insertWithPk(AircraftBo aircraftBo);
-
-    /**
-     * 修改机型机号
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 更新成功,false 更新失败
-     */
-    boolean update(AircraftBo aircraftBo);
-
-    /**
-     * 批量删除机型机号
-     *
-     * @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<AircraftVo> listVo, String sheetName, LoginUser user);
-
-}

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

@@ -1,216 +0,0 @@
-package org.eco.als.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.util.ObjectUtil;
-import com.mybatisflex.core.query.QueryWrapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.eco.als.domain.Aircraft;
-import org.eco.als.domain.bo.AircraftBo;
-import org.eco.als.domain.vo.AircraftImportVo;
-import org.eco.als.domain.vo.AircraftVo;
-import org.eco.als.listener.AircraftImportListener;
-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.service.AircraftService;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.core.utils.SpringUtils;
-import org.eco.common.core.utils.TreeBuildUtils;
-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.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.AircraftTableDef.AIRCRAFT;
-
-/**
- * 机型机号Service业务层处理
- *
- * @author wgk
- * @date 2024-07-19
- */
-@Service
-@Slf4j
-public class AircraftServiceImpl extends BaseServiceImpl<AircraftMapper, Aircraft> implements IAircraftService, AircraftService {
-    @Resource
-    private AircraftMapper aircraftMapper;
-
-    @Resource
-    private IExcelService excelService;
-
-    @Resource
-    private IImportExportService importExportService;
-
-    @Override
-    public QueryWrapper query() {
-        return super.query().from(AIRCRAFT);
-    }
-
-    private QueryWrapper buildQueryWrapper(AircraftBo aircraftBo) {
-        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(AIRCRAFT.NAME.like
-            (aircraftBo.getName()));
-        queryWrapper.orderBy(AIRCRAFT.ORDER_NUM.asc());
-
-        return queryWrapper;
-    }
-
-    /**
-     * 查询机型机号
-     *
-     * @param id 机型机号主键
-     * @return 机型机号
-     */
-    @Override
-    public AircraftVo selectById(Long id) {
-        return this.getOneAs(query().where(AIRCRAFT.ID.eq(id)), AircraftVo.class);
-
-    }
-
-    /**
-     * 查询机型机号
-     *
-     * @param name 机型机号主键
-     * @return 机型机号
-     */
-    @Override
-    public AircraftVo selectByName(String name) {
-        return this.getOneAs(query().where(AIRCRAFT.NAME.eq(name)), AircraftVo.class);
-    }
-
-    /**
-     * 查询机型机号列表
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 机型机号集合
-     */
-    @Override
-    public List<AircraftVo> selectList(AircraftBo aircraftBo) {
-        QueryWrapper queryWrapper = buildQueryWrapper(aircraftBo);
-        return this.listAs(queryWrapper, AircraftVo.class);
-    }
-
-    @Override
-    public List<Tree<Long>> selectTree(AircraftBo aircraftBo) {
-        List<AircraftVo> list = SpringUtils.getAopProxy(this).selectList(aircraftBo);
-        return buildTree(list);
-    }
-
-    @Override
-    public List<Tree<Long>> buildTree(List<AircraftVo> aircraftVoList) {
-        if (CollUtil.isEmpty(aircraftVoList)) {
-            return CollUtil.newArrayList();
-        }
-        return TreeBuildUtils.build(aircraftVoList, (dept, tree) ->
-            tree.setId(dept.getId())
-                .setParentId(dept.getParentId())
-                .setName(dept.getName())
-                .setWeight(dept.getOrderNum()));
-    }
-
-
-    /**
-     * 新增机型机号
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 操作成功,false 操作失败
-     */
-    @Override
-    public boolean insert(AircraftBo aircraftBo) {
-        Aircraft aircraft = MapstructUtils.convert(aircraftBo, Aircraft.class);
-
-        return this.save(aircraft);//使用全局配置的雪花算法主键生成器生成ID值
-    }
-
-    /**
-     * 新增机型机号,前台提供主键值,一般用于导入的场合
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 操作成功,false 操作失败
-     */
-    @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");
-        } else {
-            AircraftVo parentAircraft = selectById(aircraftBo.getParentId());
-            if (ObjectUtil.isNotNull(parentAircraft)) {
-                aircraft.setAncestors(parentAircraft.getAncestors() + "," + parentId);
-            } else {
-                aircraft.setAncestors("0");
-            }
-        }
-
-        return aircraftMapper.insertWithPk(aircraft) > 0;//前台传来主键值
-    }
-
-    /**
-     * 修改机型机号
-     *
-     * @param aircraftBo 机型机号Bo
-     * @return 结果:true 更新成功,false 更新失败
-     */
-    @Override
-    public boolean update(AircraftBo aircraftBo) {
-        Aircraft aircraft = MapstructUtils.convert(aircraftBo, Aircraft.class);
-        if (ObjectUtil.isNotNull(aircraft) && ObjectUtil.isNotNull(aircraft.getId())) {
-            return this.updateById(aircraft);
-        }
-        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, AircraftImportVo.class, new AircraftImportListener(updateSupport, loginUser));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        boolean flag = importExportService.saveInfo(result, loginUser, "0");
-        if (flag) {
-            log.info("异步导入日志写入成功");
-        }
-    }
-
-    @Override
-    public void asyncExport(List<AircraftVo> listVo, String sheetName, LoginUser loginUser) {
-        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, AircraftVo.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));
-    }
-
-    @Override
-    public String selectAircraftNoById(Long aircraftId) {
-        AircraftVo aircraft = selectById(aircraftId);
-        return ObjectUtil.isNull(aircraft) ? null : aircraft.getName();
-    }
-}