通讯录， 同步导入导出

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

@@ -1,19 +1,16 @@
 package org.eco.als.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.collection.CollUtil;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.AirConfigurationBo;
-import org.eco.als.domain.vo.AirConfigurationExportVo;
 import org.eco.als.domain.vo.AirConfigurationImportVo;
 import org.eco.als.domain.vo.AirConfigurationVo;
 import org.eco.als.listener.AirConfigurationImportListener;
 import org.eco.als.service.IAirConfigurationService;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
-import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
@@ -65,8 +62,7 @@ public class AirConfigurationController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, AirConfigurationBo airConfigurationBo) {
         List<AirConfigurationVo> list = airConfigurationService.selectList(airConfigurationBo);
-        List<AirConfigurationExportVo> listVo = MapstructUtils.convert(list, AirConfigurationExportVo.class);
-        ExcelUtil.exportExcel(listVo, "飞机构型", AirConfigurationExportVo.class, response);
+        ExcelUtil.exportExcel(list, "飞机构型", AirConfigurationVo.class, response);
     }
 
     /**

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

@@ -4,17 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.eco.als.domain.ModelExportVo;
-import org.eco.als.domain.bo.AirConfigurationBo;
 import org.eco.als.domain.bo.ModelBo;
 import org.eco.als.domain.vo.*;
-import org.eco.als.listener.AirConfigurationImportListener;
 import org.eco.als.listener.ModelImportListener;
 import org.eco.als.service.IModelService;
 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.core.utils.MapstructUtils;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
@@ -72,8 +68,7 @@ public class ModelController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, ModelBo modelBo) {
         List<ModelVo> list = modelService.selectList(modelBo);
-        List<ModelExportVo> listVo = MapstructUtils.convert(list, ModelExportVo.class);
-        ExcelUtil.exportExcel(listVo, "模型信息", ModelExportVo.class, response);
+        ExcelUtil.exportExcel(list, "模型信息", ModelVo.class, response);
     }
 
     /**

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

@@ -1,66 +0,0 @@
-package org.eco.als.domain;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.eco.als.domain.vo.AirConfigurationVo;
-import org.eco.als.domain.vo.ModelVo;
-import org.eco.common.excel.convert.ExcelDictConvert;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 模型信息导入视图对象 als_model_t
- *
- * @author wgk
- * @date 2024-07-22
- */
-
-@Data
-@NoArgsConstructor
-@ExcelIgnoreUnannotated
-@AutoMapper(target = ModelVo.class, convertGenerate = false)
-public class ModelExportVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 模型名称
-     */
-    @ExcelProperty(value = "模型名称")
-    private String name;
-
-    /**
-     * 模型类型
-     */
-    @ExcelProperty(value = "模型类型")
-    private String type;
-
-    /**
-     * 模型链接
-     */
-    @ExcelProperty(value = "模型链接")
-    private String url;
-
-    /**
-     * 参数
-     */
-    @ExcelProperty(value = "参数")
-    private String param;
-
-    /**
-     * 数据列
-     */
-    @ExcelProperty(value = "数据列")
-    private String columnData;
-
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
-}

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

@@ -1,88 +0,0 @@
-package org.eco.als.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 飞机构型导入视图对象 als_air_configuration_t
- *
- * @author wgk
- * @date 2024-11-13
- */
-
-@Data
-@NoArgsConstructor
-@ExcelIgnoreUnannotated
-@AutoMapper(target = AirConfigurationVo.class, convertGenerate = false)
-public class AirConfigurationExportVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 父Id
-     */
-    @ExcelProperty(value = "父Id")
-    private Long parentId;
-
-    /**
-     * 机型
-     */
-    @ExcelProperty(value = "机型")
-    private String aircraftType;
-
-    /**
-     * 构型编码
-     */
-    @ExcelProperty(value = "构型编码")
-    private String conCode;
-
-    /**
-     * 产品名称
-     */
-    @ExcelProperty(value = "产品名称")
-    private String name;
-
-    /**
-     * 规格型号
-     */
-    @ExcelProperty(value = "规格型号")
-    private String specsModel;
-
-    /**
-     * 图号
-     */
-    @ExcelProperty(value = "图号")
-    private String drawingNumber;
-
-    /**
-     * 供应商
-     */
-    @ExcelProperty(value = "供应商")
-    private String supplier;
-
-    /**
-     * 描述
-     */
-    @ExcelProperty(value = "描述")
-    private String remarks;
-
-    /**
-     * 删除标识（1删除 0未删除）
-     */
-    @ExcelProperty(value = "删除标识（1删除 0未删除）")
-    private Integer delFlag;
-
-
-    /**
-     * 显示顺序
-     */
-    @ExcelProperty(value = "显示顺序")
-    private Integer orderNum;
-}

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

@@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.Model;
-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;
@@ -45,8 +43,7 @@ public class ModelVo extends BaseEntity implements Serializable {
     /**
      * 模型类型
      */
-    @ExcelProperty(value = "模型类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_app_type")
+    @ExcelProperty(value = "模型类型")
     private String type;
 
     /**
@@ -70,8 +67,6 @@ public class ModelVo extends BaseEntity implements Serializable {
     /**
      * 状态
      */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
 
     /**