Merge branch 'dev-wgk' of www/als into master

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

@@ -5,13 +5,18 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.eco.als.domain.bo.WarningBo;
+import org.eco.als.domain.vo.DataImportVo;
 import org.eco.als.domain.vo.WarningImportVo;
 import org.eco.als.domain.vo.WarningVo;
 import org.eco.als.listener.WarningImportListener;
+import org.eco.als.service.IDataImportService;
 import org.eco.als.service.IWarningService;
+import org.eco.als.utils.CsvUtils;
+import org.eco.common.core.constant.Constants;
 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.StringUtils;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
@@ -19,12 +24,15 @@ 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.eco.system.domain.vo.SysOssVo;
+import org.eco.system.service.ISysOssService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * 警告信息Controller
@@ -40,6 +48,12 @@ public class WarningController extends BaseController {
     @Resource
     private IWarningService warningService;
 
+    @Resource
+    private IDataImportService dataImportService;
+
+    @Resource
+    private ISysOssService sysOssService;
+
     /**
      * 查询警告信息列表
      */
@@ -62,7 +76,7 @@ public class WarningController extends BaseController {
 //        return CommonResult.success();
 //    }
 
-//    @SaCheckPermission("als:warning:import")
+    //    @SaCheckPermission("als:warning:import")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil.exportExcel(new ArrayList<>(), "警告信息", WarningImportVo.class, response);
@@ -132,4 +146,17 @@ public class WarningController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    /**
+     * 获取警告信息对应的参数详细信息
+     */
+    @GetMapping(value = "/{code}/{sortieNo}")
+    public CommonResult<String> getInfoByHmc(@PathVariable String code, @PathVariable String sortieNo) {
+        String columnData = "时间,发动机排气温度";
+        DataImportVo dataImportVo = dataImportService.selectBySortieNo(sortieNo);
+        SysOssVo ossVo = sysOssService.getById(dataImportVo.getOssId());
+        // 数据库资源地址
+        String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
+        return CommonResult.success(String.valueOf(CsvUtils.getPlaybackByHeaders(path, Arrays.asList(columnData.split(",")), null)),"");
+    }
 }

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

@@ -2,7 +2,6 @@ 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.Warning;
@@ -32,19 +31,18 @@ public class WarningBo extends BaseEntity {
     /**
      * 机号Id
      */
-    @NotNull(message = "机号不能为空")
     private String aircraftId;
 
     /**
      * 警告代码
      */
-    @NotBlank(message = "警告代码不能为空")
+    @NotBlank(message = "HMC代码不能为空")
     private String code;
 
     /**
      * 警告名称
      */
-    @NotBlank(message = "警告名称不能为空")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

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

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.AirConfiguration;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.AirConfiguration;
+import org.eco.common.orm.core.domain.TreeEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.TreeEntity;
-
 /**
  * 飞机构型视图对象 als_air_configuration_t
  *
@@ -86,16 +81,4 @@ public class AirConfigurationVo extends TreeEntity implements Serializable {
     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/AirInstallVo.java

@@ -2,8 +2,6 @@ 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;
@@ -143,16 +141,4 @@ public class AirInstallVo extends BaseEntity implements Serializable {
     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/AtlasFileVo.java

@@ -2,8 +2,6 @@ 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;
@@ -71,16 +69,4 @@ public class AtlasFileVo extends BaseEntity implements Serializable {
     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/CarryChecklistVo.java

@@ -2,8 +2,6 @@ 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;
@@ -45,12 +43,6 @@ public class CarryChecklistVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 成品名称
@@ -95,16 +87,4 @@ public class CarryChecklistVo extends BaseEntity implements Serializable {
     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/ContactsVo.java

@@ -2,8 +2,6 @@ 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;
@@ -71,16 +69,4 @@ public class ContactsVo extends BaseEntity implements Serializable {
     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/DataImportVo.java

@@ -2,8 +2,6 @@ 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 com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -62,13 +60,6 @@ public class DataImportVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
-
     /**
      * 飞行日期
      */
@@ -88,16 +79,4 @@ public class DataImportVo extends BaseEntity implements Serializable {
     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/FalseAlarmResultVo.java

@@ -2,8 +2,6 @@ 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;
@@ -53,12 +51,6 @@ public class FalseAlarmResultVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 警告代码
@@ -91,16 +83,4 @@ public class FalseAlarmResultVo extends BaseEntity implements Serializable {
     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

@@ -2,8 +2,6 @@ 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;
@@ -71,12 +69,6 @@ public class FalseAlarmVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "数据列")
     private String columnData;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 状态
@@ -91,16 +83,4 @@ public class FalseAlarmVo extends BaseEntity implements Serializable {
     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/FaultCaseVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultCase;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultCase;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障案例视图对象 als_fault_case_t
  *
@@ -134,16 +129,4 @@ public class FaultCaseVo extends BaseEntity implements Serializable {
     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/FaultConsumableVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultConsumable;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultConsumable;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障所需耗材视图对象 als_fault_consumable_t
  *
@@ -68,16 +63,4 @@ public class FaultConsumableVo extends BaseEntity implements Serializable {
     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/FaultDiagnosisResultVo.java

@@ -2,8 +2,6 @@ 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;
@@ -104,16 +102,4 @@ public class FaultDiagnosisResultVo extends BaseEntity implements Serializable {
     private Integer delFlag;
 
 
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
-
 }

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

@@ -2,8 +2,6 @@ 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;
@@ -77,12 +75,6 @@ public class FaultDiagnosisVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "结果")
     private String resultContent;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 状态（1正常）
@@ -96,16 +88,4 @@ public class FaultDiagnosisVo extends BaseEntity implements Serializable {
     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/FaultEquipmentVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultEquipment;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultEquipment;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障所需设备视图对象 als_fault_equipment_t
  *
@@ -80,16 +75,4 @@ public class FaultEquipmentVo extends BaseEntity implements Serializable {
     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/FaultNotesVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultNotes;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultNotes;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障注意事项视图对象 als_fault_notes_t
  *
@@ -62,16 +57,4 @@ public class FaultNotesVo extends BaseEntity implements Serializable {
     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/FaultPersonnelVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultPersonnel;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultPersonnel;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障操作人员视图对象 als_fault_personnel_t
  *
@@ -74,16 +69,4 @@ public class FaultPersonnelVo extends BaseEntity implements Serializable {
     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/FaultSetpsVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultSetps;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultSetps;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障操作步骤视图对象 als_fault_setps_t
  *
@@ -68,16 +63,4 @@ public class FaultSetpsVo extends BaseEntity implements Serializable {
     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/FaultSparePartsVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.FaultSpareParts;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.FaultSpareParts;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 故障所需备件视图对象 als_fault_spare_parts_t
  *
@@ -80,16 +75,4 @@ public class FaultSparePartsVo extends BaseEntity implements Serializable {
     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/FlightSplitTaskVo.java

@@ -2,8 +2,6 @@ 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;
@@ -95,16 +93,4 @@ public class FlightSplitTaskVo extends BaseEntity implements Serializable {
     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/FlightTaskVo.java

@@ -2,8 +2,6 @@ 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;
@@ -52,12 +50,6 @@ public class FlightTaskVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 起飞时间
@@ -90,16 +82,4 @@ public class FlightTaskVo extends BaseEntity implements Serializable {
     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/LifePredictionResultVo.java

@@ -2,8 +2,6 @@ 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;
@@ -47,12 +45,6 @@ public class LifePredictionResultVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 部件名称
@@ -99,16 +91,4 @@ public class LifePredictionResultVo extends BaseEntity implements Serializable {
     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/LifePredictionVo.java

@@ -2,8 +2,6 @@ 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;
@@ -41,12 +39,6 @@ public class LifePredictionVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 部件名称
@@ -93,16 +85,4 @@ public class LifePredictionVo extends BaseEntity implements Serializable {
     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/MaintenanceDecisionVo.java

@@ -2,8 +2,6 @@ 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;
@@ -45,12 +43,6 @@ public class MaintenanceDecisionVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 诊断结果
@@ -100,16 +92,4 @@ public class MaintenanceDecisionVo extends BaseEntity implements Serializable {
     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/MaintenanceRecordVo.java

@@ -2,8 +2,6 @@ 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;
@@ -46,12 +44,6 @@ public class MaintenanceRecordVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 出厂号码
@@ -216,16 +208,4 @@ public class MaintenanceRecordVo extends BaseEntity implements Serializable {
     private String remarks;
 
 
-    /**
-     * 创建人名称
-     */
-    @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/MaintenanceTaskVo.java

@@ -1,23 +1,16 @@
 package org.eco.als.domain.vo;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.eco.als.domain.MaintenanceTask;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.MaintenanceTask;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
-
-import org.eco.common.orm.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 维修信息视图对象 als_maintenance_task_t
@@ -131,16 +124,4 @@ public class MaintenanceTaskVo extends BaseEntity implements Serializable {
     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/MaintenanceVo.java

@@ -1,20 +1,16 @@
 package org.eco.als.domain.vo;
 
-import java.util.Date;
-
-import org.eco.als.domain.Maintenance;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.Maintenance;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
-
-import org.eco.common.orm.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 维修信息视图对象 als_maintenance_t
@@ -158,16 +154,4 @@ public class MaintenanceVo extends BaseEntity implements Serializable {
     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/ModelVo.java

@@ -2,8 +2,6 @@ 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;
@@ -83,16 +81,5 @@ public class ModelVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
 
 }

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

@@ -1,19 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.PartReplacement;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.PartReplacement;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 换件记录视图对象 als_part_replacement_t
  *
@@ -102,16 +99,4 @@ public class PartReplacementVo extends BaseEntity implements Serializable {
     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/PersonnelAllocationVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.PersonnelAllocation;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.PersonnelAllocation;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 维修任务任务派遣视图对象 als_personnel_allocation_t
  *
@@ -80,16 +75,4 @@ public class PersonnelAllocationVo extends BaseEntity implements Serializable {
     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/PreProcessingVo.java

@@ -2,8 +2,6 @@ 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;
@@ -47,12 +45,6 @@ public class PreProcessingVo extends BaseEntity implements Serializable {
      */
     private String aircraftId;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 文件Id
@@ -99,16 +91,4 @@ public class PreProcessingVo extends BaseEntity implements Serializable {
     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/ProductVo.java

@@ -2,8 +2,6 @@ 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;
@@ -51,15 +49,4 @@ public class ProductVo extends TreeEntity implements Serializable {
      */
     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/ResourceAllocationVo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.vo;
 
-import org.eco.als.domain.ResourceAllocation;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
-import com.eco.common.mapper.constant.MapperConstant;
-import com.eco.common.mapper.annotation.FieldMapper;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.ResourceAllocation;
+import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
 
-import org.eco.common.orm.core.domain.BaseEntity;
-
 /**
  * 维修任务资源分配视图对象 als_resource_allocation_t
  *
@@ -92,16 +87,4 @@ public class ResourceAllocationVo extends BaseEntity implements Serializable {
     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/SafeRuleSubVo.java

@@ -2,8 +2,6 @@ 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;
@@ -89,16 +87,4 @@ public class SafeRuleSubVo extends BaseEntity implements Serializable {
     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/SafeRuleVo.java

@@ -2,8 +2,6 @@ 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;
@@ -65,16 +63,4 @@ public class SafeRuleVo extends BaseEntity implements Serializable {
     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/SmTaskVo.java

@@ -2,8 +2,6 @@ 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;
@@ -113,16 +111,4 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     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/SortieVo.java

@@ -2,8 +2,6 @@ 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;
@@ -41,12 +39,6 @@ public class SortieVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "架次号")
     private String sortieNo;
 
-    /**
-     * 机号
-     */
-    @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
 
     /**
      * 机号Id
@@ -83,15 +75,4 @@ public class SortieVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
 }

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

@@ -2,8 +2,6 @@ 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;
@@ -77,16 +75,4 @@ public class SparePartsVo extends BaseEntity implements Serializable {
     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/TaskVo.java

@@ -2,8 +2,6 @@ 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;
@@ -104,16 +102,4 @@ public class TaskVo extends BaseEntity implements Serializable {
     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/TechnicalDocVo.java

@@ -2,8 +2,6 @@ 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;
@@ -71,15 +69,4 @@ public class TechnicalDocVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "删除标识（1删除 0未删除）")
     private Integer delFlag;
 
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建人名称
-     */
-    @FieldMapper(type = MapperConstant.USER_ID_TO_NAME, mapper = "updateBy")
-    private String updateByName;
 }

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

@@ -34,7 +34,7 @@ public class WarningImportVo implements Serializable {
     /**
      * 警告代码
      */
-    @ExcelProperty(value = "警告代码")
+    @ExcelProperty(value = "HMC码")
     private String code;
 
     /**

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

@@ -2,13 +2,10 @@ 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.Warning;
-import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.convert.ExcelDictConvert;
 import org.eco.common.orm.core.domain.BaseEntity;
 
@@ -51,13 +48,12 @@ public class WarningVo extends BaseEntity implements Serializable {
      * 机号
      */
     @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
     /**
      * 警告代码
      */
-    @ExcelProperty(value = "警告代码")
+    @ExcelProperty(value = "HMC码")
     private String code;
 
     /**
@@ -76,7 +72,6 @@ public class WarningVo extends BaseEntity implements Serializable {
      * 状态
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
     private String status;
 
     /**
@@ -85,16 +80,4 @@ public class WarningVo extends BaseEntity implements Serializable {
     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/WarningImportListener.java

@@ -84,9 +84,15 @@ public class WarningImportListener extends AnalysisEventListener<WarningImportVo
     private void setBo(WarningBo warningBo) {
         warningBo.setVersion(0);
         warningBo.setSortieNo(sortieNo);
-        warningBo.setCreateBy(loginUser.getUserId());
-        warningBo.setUpdateBy(loginUser.getUserId());
-        warningBo.setTenantId(loginUser.getTenantId());
+        if (ObjectUtil.isNull(loginUser)) {
+            warningBo.setCreateBy(1L);
+            warningBo.setUpdateBy(1L);
+            warningBo.setTenantId(0L);
+        } else {
+            warningBo.setUpdateBy(loginUser.getUserId());
+            warningBo.setCreateBy(loginUser.getUserId());
+            warningBo.setTenantId(loginUser.getTenantId());
+        }
     }
 
     @Override

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

@@ -26,6 +26,14 @@ public interface IDataImportService extends IBaseService<DataImport> {
      */
     DataImportVo selectById(Long id);
 
+    /**
+     * 查询数据导入信息
+     *
+     * @param sortieNo 架次号
+     * @return 数据导入信息
+     */
+    DataImportVo selectBySortieNo(String sortieNo);
+
     /**
      * 查询数据导入信息列表
      *

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

@@ -97,6 +97,11 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
 
     }
 
+    @Override
+    public DataImportVo selectBySortieNo(String sortieNo) {
+        return this.getOneAs(query().where(DATA_IMPORT.SORTIE_NO.eq(sortieNo)), DataImportVo.class);
+    }
+
 
     /**
      * 查询数据导入信息列表

als-modules/agile-assurance/src/main/java/org/eco/als/utils/CsvUtils.java

@@ -216,7 +216,7 @@ public class CsvUtils {
     }
 
     public static JSONObject getPlaybackByHeaders(String csvFilePath, List<String> headerNames, Integer step) {
-        List<CsvRow> rows = getCsvRowList(EcoConfig.getUploadPath() + csvFilePath);
+        List<CsvRow> rows = getCsvRowList(EcoConfig.getProfile() + csvFilePath);
         // 获取CSV表头，即第一行数据
         List<String> headers = rows.get(0).getRawList();
         List<Integer> indexList = new ArrayList<>();