寿命件管理导出，映射机号 机型 构型

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

@@ -0,0 +1,25 @@
+package org.eco.als.domain;
+
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author GaoKunW
+ * @description Air
+ * @date 2025/4/27 11:58
+ */
+@Data
+@Table(value = "T_AIRCAFT_CATALOG")
+public class AircaftCatalog implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    private String aircaftCatalogId;
+    private String aircaftCatalogCode;
+}

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

@@ -0,0 +1,25 @@
+package org.eco.als.domain;
+
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author GaoKunW
+ * @description Air
+ * @date 2025/4/27 11:58
+ */
+@Data
+@Table(value = "T_AIRCAFT_MODEL")
+public class AircaftModel implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    private String aircaftModelId;
+    private String aircaftModelName;
+}

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

@@ -1,15 +1,14 @@
 package org.eco.als.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 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;
-import org.eco.common.orm.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 有寿件对象 als_lifetime_spare_parts_t

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

@@ -1,20 +1,17 @@
 package org.eco.als.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.eco.als.domain.LifetimeSpareParts;
 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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.mybatisflex.annotation.RelationOneToOne;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.eco.als.domain.LifetimeSpareParts;
+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_lifetime_spare_parts_t
@@ -36,16 +33,38 @@ private static final long serialVersionUID = 1L;
     private Long id;
 
     /** 飞机机号 */
-    @ExcelProperty(value = "机型")
     private String airModelId;
+    @ExcelProperty(value = "机型")
+    @RelationOneToOne(
+        selfField = "airModelId",
+        targetTable = "T_AIRCAFT_MODEL",
+        targetField = "aircaftModelId",
+        valueField = "aircaftModelName"
+    )
+    private String airModel;
 
     /** 飞机编目 */
-    @ExcelProperty(value = "编目")
     private String airId;
+    @ExcelProperty(value = "编目")
+    @RelationOneToOne(
+        selfField = "airId",
+        targetTable = "T_AIRCAFT_CATALOG",
+        targetField = "aircaftCatalogId",
+        valueField = "aircaftCatalogCode"
+    )
+    private String airCode;
 
     /** 构型Id */
-    @ExcelProperty(value = "构型")
     private String configId;
+    @ExcelProperty(value = "构型")
+    @RelationOneToOne(
+        selfField = "configId",
+        targetTable = "als_air_configuration_t",
+        targetField = "id",
+        valueField = "name"
+    )
+    private String configName;
+
 
     /** 部件名称 */
     @ExcelProperty(value = "部件名称")

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/AircaftCatalogMapper.java

@@ -0,0 +1,13 @@
+package org.eco.als.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import org.eco.als.domain.AircaftCatalog;
+
+/**
+ * @author GaoKunW
+ * @description AircaftCatalogMapper
+ * @date 2025/4/27 14:43
+ */
+public interface AircaftCatalogMapper extends BaseMapper<AircaftCatalog> {
+}

als-modules/agile-assurance/src/main/java/org/eco/als/mapper/AircaftModelMapper.java

@@ -0,0 +1,13 @@
+package org.eco.als.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import org.eco.als.domain.AircaftModel;
+
+/**
+ * @author GaoKunW
+ * @description AircaftCatalogMapper
+ * @date 2025/4/27 14:43
+ */
+public interface AircaftModelMapper extends BaseMapper<AircaftModel> {
+}

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

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.eco.als.domain.table.KGraphClauseTableDef.K_GRAPH_CLAUSE;
+import static org.eco.als.domain.table.KGraphClauseTableDef.KGRAPH_CLAUSE;
 
 /**
  * 知识图谱分句结果Service业务层处理
@@ -37,20 +37,20 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
 
     @Override
     public QueryWrapper query() {
-        return super.query().from(K_GRAPH_CLAUSE);
+        return super.query().from(KGRAPH_CLAUSE);
     }
 
     private QueryWrapper buildQueryWrapper(KGraphClauseBo kGraphClauseBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(K_GRAPH_CLAUSE.TASK_ID.eq
+        queryWrapper.and(KGRAPH_CLAUSE.TASK_ID.eq
             (kGraphClauseBo.getTaskId()));
-        queryWrapper.and(K_GRAPH_CLAUSE.CLAUSE.eq
+        queryWrapper.and(KGRAPH_CLAUSE.CLAUSE.eq
             (kGraphClauseBo.getClause()));
-        queryWrapper.and(K_GRAPH_CLAUSE.STATUS.eq
+        queryWrapper.and(KGRAPH_CLAUSE.STATUS.eq
             (kGraphClauseBo.getStatus()));
-        queryWrapper.and(K_GRAPH_CLAUSE.REMARKS.eq
+        queryWrapper.and(KGRAPH_CLAUSE.REMARKS.eq
             (kGraphClauseBo.getRemarks()));
-        queryWrapper.orderBy(K_GRAPH_CLAUSE.UPDATE_TIME.desc());
+        queryWrapper.orderBy(KGRAPH_CLAUSE.UPDATE_TIME.desc());
         return queryWrapper;
     }
 
@@ -62,7 +62,7 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
      */
     @Override
     public KGraphClauseVo selectById(Long id) {
-        return this.getOneAs(query().where(K_GRAPH_CLAUSE.ID.eq(id)), KGraphClauseVo.class);
+        return this.getOneAs(query().where(KGRAPH_CLAUSE.ID.eq(id)), KGraphClauseVo.class);
 
     }
 

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

@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.eco.als.domain.table.KGraphClauseTableDef.K_GRAPH_CLAUSE;
-import static org.eco.als.domain.table.KGraphEntityTableDef.K_GRAPH_ENTITY;
+import static org.eco.als.domain.table.KGraphClauseTableDef.KGRAPH_CLAUSE;
+import static org.eco.als.domain.table.KGraphEntityTableDef.KGRAPH_ENTITY;
 
 /**
  * 知识图谱实体关系Service业务层处理
@@ -38,28 +38,28 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
 
     @Override
     public QueryWrapper query() {
-        return super.query().from(K_GRAPH_ENTITY);
+        return super.query().from(KGRAPH_ENTITY);
     }
 
     private QueryWrapper buildQueryWrapper(KGraphEntityBo kGraphEntityBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(K_GRAPH_ENTITY.CLAUSE_ID.eq
+        queryWrapper.and(KGRAPH_ENTITY.CLAUSE_ID.eq
             (kGraphEntityBo.getClauseId()));
-        queryWrapper.and(K_GRAPH_ENTITY.HEAD_ENTITY.eq
+        queryWrapper.and(KGRAPH_ENTITY.HEAD_ENTITY.eq
             (kGraphEntityBo.getHeadEntity()));
-        queryWrapper.and(K_GRAPH_ENTITY.HEAD_ENTITY_CLASS.eq
+        queryWrapper.and(KGRAPH_ENTITY.HEAD_ENTITY_CLASS.eq
             (kGraphEntityBo.getHeadEntityClass()));
-        queryWrapper.and(K_GRAPH_ENTITY.RELATION.eq
+        queryWrapper.and(KGRAPH_ENTITY.RELATION.eq
             (kGraphEntityBo.getRelation()));
-        queryWrapper.and(K_GRAPH_ENTITY.TAIL_ENTITY.eq
+        queryWrapper.and(KGRAPH_ENTITY.TAIL_ENTITY.eq
             (kGraphEntityBo.getTailEntity()));
-        queryWrapper.and(K_GRAPH_ENTITY.TAIL_ENTITY_CLASS.eq
+        queryWrapper.and(KGRAPH_ENTITY.TAIL_ENTITY_CLASS.eq
             (kGraphEntityBo.getTailEntityClass()));
-        queryWrapper.and(K_GRAPH_ENTITY.STATUS.eq
+        queryWrapper.and(KGRAPH_ENTITY.STATUS.eq
             (kGraphEntityBo.getStatus()));
-        queryWrapper.and(K_GRAPH_ENTITY.REMARKS.eq
+        queryWrapper.and(KGRAPH_ENTITY.REMARKS.eq
             (kGraphEntityBo.getRemarks()));
-        queryWrapper.orderBy(K_GRAPH_ENTITY.UPDATE_TIME.desc());
+        queryWrapper.orderBy(KGRAPH_ENTITY.UPDATE_TIME.desc());
 
         return queryWrapper;
     }
@@ -72,7 +72,7 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
      */
     @Override
     public KGraphEntityVo selectById(Long id) {
-        return this.getOneAs(query().where(K_GRAPH_ENTITY.ID.eq(id)), KGraphEntityVo.class);
+        return this.getOneAs(query().where(KGRAPH_ENTITY.ID.eq(id)), KGraphEntityVo.class);
 
     }
 
@@ -93,13 +93,13 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
     public List<KGraphEntityVo> selectListByTaskId(Long taskId) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.select(
-                K_GRAPH_ENTITY.HEAD_ENTITY,
-                K_GRAPH_ENTITY.HEAD_ENTITY_CLASS,
-                K_GRAPH_ENTITY.RELATION,
-                K_GRAPH_ENTITY.TAIL_ENTITY,
-                K_GRAPH_ENTITY.TAIL_ENTITY_CLASS)
-            .from(K_GRAPH_ENTITY).join(K_GRAPH_CLAUSE).on(K_GRAPH_ENTITY.CLAUSE_ID.eq(K_GRAPH_CLAUSE.ID))
-            .where(K_GRAPH_CLAUSE.TASK_ID.eq(taskId)).and(K_GRAPH_CLAUSE.STATUS.eq(1));
+                KGRAPH_ENTITY.HEAD_ENTITY,
+                KGRAPH_ENTITY.HEAD_ENTITY_CLASS,
+                KGRAPH_ENTITY.RELATION,
+                KGRAPH_ENTITY.TAIL_ENTITY,
+                KGRAPH_ENTITY.TAIL_ENTITY_CLASS)
+            .from(KGRAPH_ENTITY).join(KGRAPH_CLAUSE).on(KGRAPH_ENTITY.CLAUSE_ID.eq(KGRAPH_CLAUSE.ID))
+            .where(KGRAPH_CLAUSE.TASK_ID.eq(taskId)).and(KGRAPH_CLAUSE.STATUS.eq(1));
         return this.listAs(queryWrapper, KGraphEntityVo.class);
     }
 

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

@@ -37,7 +37,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.eco.als.domain.table.KGraphTaskTableDef.K_GRAPH_TASK;
+import static org.eco.als.domain.table.KGraphTaskTableDef.KGRAPH_TASK;
 
 /**
  * 知识图谱任务Service业务层处理
@@ -66,22 +66,22 @@ public class KGraphTaskServiceImpl extends BaseServiceImpl<KGraphTaskMapper, KGr
 
     @Override
     public QueryWrapper query() {
-        return super.query().from(K_GRAPH_TASK);
+        return super.query().from(KGRAPH_TASK);
     }
 
     private QueryWrapper buildQueryWrapper(KGraphTaskBo kGraphTaskBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(K_GRAPH_TASK.TASK_NAME.like
+        queryWrapper.and(KGRAPH_TASK.TASK_NAME.like
             (kGraphTaskBo.getTaskName()));
-        queryWrapper.and(K_GRAPH_TASK.TASK_TYPE.eq
+        queryWrapper.and(KGRAPH_TASK.TASK_TYPE.eq
             (kGraphTaskBo.getTaskType()));
-        queryWrapper.and(K_GRAPH_TASK.OSS_ID.eq
+        queryWrapper.and(KGRAPH_TASK.OSS_ID.eq
             (kGraphTaskBo.getOssId()));
-        queryWrapper.and(K_GRAPH_TASK.STATUS.eq
+        queryWrapper.and(KGRAPH_TASK.STATUS.eq
             (kGraphTaskBo.getStatus()));
-        queryWrapper.and(K_GRAPH_TASK.REMARKS.eq
+        queryWrapper.and(KGRAPH_TASK.REMARKS.eq
             (kGraphTaskBo.getRemarks()));
-        queryWrapper.orderBy(K_GRAPH_TASK.UPDATE_TIME.desc());
+        queryWrapper.orderBy(KGRAPH_TASK.UPDATE_TIME.desc());
         return queryWrapper;
     }
 
@@ -93,7 +93,7 @@ public class KGraphTaskServiceImpl extends BaseServiceImpl<KGraphTaskMapper, KGr
      */
     @Override
     public KGraphTaskVo selectById(Long id) {
-        return this.getOneAs(query().where(K_GRAPH_TASK.ID.eq(id)), KGraphTaskVo.class);
+        return this.getOneAs(query().where(KGRAPH_TASK.ID.eq(id)), KGraphTaskVo.class);
 
     }
 

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

@@ -1,35 +1,33 @@
 package org.eco.als.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.LifetimeSpareParts;
+import org.eco.als.domain.bo.LifetimeSparePartsBo;
+import org.eco.als.domain.vo.LifetimeSparePartsImportVo;
+import org.eco.als.domain.vo.LifetimeSparePartsVo;
+import org.eco.als.listener.LifetimeSparePartsImportListener;
+import org.eco.als.mapper.LifetimeSparePartsMapper;
+import org.eco.als.service.ILifetimeSparePartsService;
 import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
-import org.eco.common.core.utils.bean.BeanUtils;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.system.service.IImportExportService;
-import org.eco.common.core.utils.StringUtils;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.common.orm.core.page.PageQuery;
-import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
+import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
-import org.eco.als.mapper.LifetimeSparePartsMapper;
-import org.eco.als.domain.LifetimeSpareParts;
-import org.eco.als.domain.bo.LifetimeSparePartsBo;
-import org.eco.als.domain.vo.LifetimeSparePartsVo;
-import org.eco.als.domain.vo.LifetimeSparePartsImportVo;
-import org.eco.als.listener.LifetimeSparePartsImportListener;
-import org.eco.als.service.ILifetimeSparePartsService;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.eco.als.domain.table.LifetimeSparePartsTableDef.LIFETIME_SPARE_PARTS;
 
 /**
@@ -91,7 +89,7 @@ public class LifetimeSparePartsServiceImpl extends BaseServiceImpl<LifetimeSpare
     @Override
     public List<LifetimeSparePartsVo> selectList(LifetimeSparePartsBo lifetimeSparePartsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(lifetimeSparePartsBo);
-            return this.listAs(queryWrapper, LifetimeSparePartsVo.class);
+        return lifetimeSparePartsMapper.selectListWithRelationsByQueryAs(queryWrapper, LifetimeSparePartsVo.class);
     }
 
     /**
@@ -103,7 +101,7 @@ public class LifetimeSparePartsServiceImpl extends BaseServiceImpl<LifetimeSpare
     @Override
     public PageResult<LifetimeSparePartsVo> selectPage(LifetimeSparePartsBo lifetimeSparePartsBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(lifetimeSparePartsBo);
-            Page<LifetimeSparePartsVo> page = this.pageAs(PageQuery.build(), queryWrapper, LifetimeSparePartsVo.class);
+        Page<LifetimeSparePartsVo> page = lifetimeSparePartsMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, LifetimeSparePartsVo.class);
         return PageResult.build(page);
     }
 
@@ -116,8 +114,7 @@ public class LifetimeSparePartsServiceImpl extends BaseServiceImpl<LifetimeSpare
     @Override
     public boolean insert(LifetimeSparePartsBo lifetimeSparePartsBo) {
     LifetimeSpareParts lifetimeSpareParts =MapstructUtils.convert(lifetimeSparePartsBo, LifetimeSpareParts. class);
-
-        return this.save(lifetimeSpareParts);//使用全局配置的雪花算法主键生成器生成ID值
+        return this.save(lifetimeSpareParts);
     }
 
     /**

pom.xml

@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <spring-boot.version>3.2.5</spring-boot.version>
-        <mybatis-flex.version>1.9.4</mybatis-flex.version>
+        <mybatis-flex.version>1.10.9</mybatis-flex.version>
         <satoken.version>1.38.0</satoken.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <HikariCP.version>5.0.1</HikariCP.version>