//构型-故障信息基础数据

eco-common/com-core/src/main/java/org/eco/vip/core/utils/MapstructUtils.java

@@ -10,6 +10,9 @@ import io.github.linpeilie.Converter;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @description MapstructUtils
  *
@@ -36,4 +39,19 @@ public class MapstructUtils {
         }
         return CONVERTER.convert(source, desc);
     }
+    /**
+     * 新增：集合对象转换（核心扩展）
+     * 将 List<T> 转换为 List<V>
+     */
+    public static <T, V> List<V> convertList(List<T> sourceList, Class<V> desc) {
+        // 处理空集合，避免空指针
+        if (ObjectUtil.isEmpty(sourceList)) {
+            return Collections.emptyList();
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return Collections.emptyList();
+        }
+        // 调用底层Converter的集合转换能力（linpeilie.Converter原生支持）
+        return CONVERTER.convert(sourceList, desc);
+    }
 }

eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/BaseEntity.java

@@ -11,6 +11,7 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.RelationOneToOne;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,7 +23,8 @@ import java.util.Date;
  */
 @Data
 public class BaseEntity implements Serializable {
-
+    @Serial
+    private static final long serialVersionUID = 1L;
     /**
      * 租户编号
      */

eco-reliability/pom.xml

@@ -6,20 +6,15 @@
     <parent>
         <groupId>org.eco.vip</groupId>
         <artifactId>eco-boot</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>eco-reliability</artifactId>
-    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
     <modules>
         <module>reliability-api</module>
         <module>reliability-service</module>
     </modules>
-
-    <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <packaging>pom</packaging>
 
 </project>

eco-reliability/reliability-api/pom.xml

@@ -6,19 +6,12 @@
     <parent>
         <groupId>org.eco.vip</groupId>
         <artifactId>eco-reliability</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <name>${project.artifactId}</name>
     <packaging>jar</packaging>
-    <groupId>org.eco.vip.reliability.api</groupId>
     <artifactId>reliability-api</artifactId>
-
-    <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.eco.vip</groupId>

eco-reliability/reliability-service/pom.xml

@@ -6,20 +6,15 @@
     <parent>
         <groupId>org.eco.vip</groupId>
         <artifactId>eco-reliability</artifactId>
-        <version>1.0.0</version>
+        <version>${revision}</version>
     </parent>
 
-    <groupId>org.eco.vip.reliability.ser</groupId>
     <artifactId>reliability-service</artifactId>
-
-    <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <name>${project.artifactId}</name>
+    <packaging>jar</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.eco.vip.reliability.api</groupId>
+            <groupId>org.eco.vip</groupId>
             <artifactId>reliability-api</artifactId>
             <version>${revision}</version>
         </dependency>

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/controller/configuration/ConfigController.java

@@ -1,42 +0,0 @@
-package org.eco.vip.reliability.ser.controller.configuration;
-
-
-
-import jakarta.annotation.Resource;
-import lombok.RequiredArgsConstructor;
-import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.reliability.ser.domain.configuration.pojo.ConfigVO;
-import org.eco.vip.reliability.ser.service.config.IConfigService;
-import org.eco.vip.web.config.core.BaseController;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * @Author: wyj
- * @CreateTime: 2025-07-28
- * @Belongpackage org.eco.vip.reliability.ser.controller.configuration
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/configguration")
-public class ConfigController extends BaseController {
-
-    @Resource
-    private IConfigService iConfigService;
-
-
-    /**
-     * 查询故障统计数量，同步
-     */
-    @GetMapping("/extra/statistics")
-    public CommonResult<List<ConfigVO>> getExtraStatistics() {
-        iConfigService.getExtraStatistics();
-        return CommonResult.success();
-    }
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/controller/configuration/FaultController.java

@@ -0,0 +1,93 @@
+package org.eco.vip.reliability.ser.controller.configuration;
+
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.reliability.ser.domain.configuration.pojo.FaultBO;
+import org.eco.vip.reliability.ser.domain.configuration.pojo.FaultVO;
+import org.eco.vip.reliability.ser.service.config.IFaultService;
+import org.eco.vip.web.config.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
+
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-07-28
+ * @Belongpackage org.eco.vip.reliability.ser.controller.configuration
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/fault")
+public class FaultController extends BaseController {
+
+    @Resource
+    private IFaultService iFaultService;
+
+
+    /**
+     * 分页查询数据库
+     * @param faultBO
+     * @return
+     */
+    @GetMapping("/page")
+    @SaCheckPermission("system:fault:page")
+    public CommonResult<PageResult<FaultVO>> page(FaultBO faultBO) {
+        return success(iFaultService.selectPage(faultBO));
+    }
+
+    /**
+     * 查询列表信息
+     * @param faultBO
+     * @return
+     */
+    @GetMapping("/list")
+    public CommonResult<List<FaultVO>> list(@RequestBody @Valid FaultBO faultBO) {
+        return success(iFaultService.selectList(faultBO));
+    }
+
+    /**
+     * 删除构型信息
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/delete")
+    @SaCheckPermission("system:fault:delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> ids) {
+        boolean result = iFaultService.delete(ids);
+        if (!result) {
+            return fail("删除构型失败！");
+        }
+        return success();
+    }
+
+    @PutMapping("/edit")
+    @SaCheckPermission("system:fault:edit")
+    public CommonResult<Void> edit(@RequestBody @Valid FaultBO faultBO) {
+        boolean result = iFaultService.update(faultBO);
+        if (!result) {
+            return fail("更新客户端失败！");
+        }
+        return success();
+    }
+    /**
+     * 查询故障统计数量，同步
+     */
+    @GetMapping("/extra/statistics")
+    public CommonResult<List<FaultVO>> getExtraStatistics() {
+        iFaultService.getExtraStatistics();
+        return CommonResult.success();
+    }
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/controller/construct/ConstructController.java

@@ -0,0 +1,163 @@
+package org.eco.vip.reliability.ser.controller.construct;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.eco.vip.core.pojo.CommonResult;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.excel.core.ExcelResult;
+import org.eco.vip.excel.utils.ExcelUtils;
+import org.eco.vip.reliability.ser.domain.construct.pojo.AircraftTreeNode;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructBO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructImport;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructVO;
+import org.eco.vip.reliability.ser.listener.ConstructImportListener;
+import org.eco.vip.reliability.ser.service.construct.IConstruct;
+import org.eco.vip.web.config.core.BaseController;
+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.List;
+
+import static org.eco.vip.core.pojo.CommonResult.fail;
+import static org.eco.vip.core.pojo.CommonResult.success;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.controller.construct
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/construct")
+public class ConstructController extends BaseController {
+
+    @Resource
+    private IConstruct iConstruct;
+
+
+    /**
+     * 分页查询数据库
+     *
+     * @param constructBO
+     * @return
+     */
+    @GetMapping("/page")
+    @SaCheckPermission("system:construct:page")
+    public CommonResult<PageResult<ConstructVO>> page(@RequestBody @Valid ConstructBO constructBO) {
+        return success(iConstruct.selectPage(constructBO));
+    }
+
+    /**
+     * 分页查询数据库
+     *
+     * @param constructBO
+     * @return
+     */
+    @GetMapping("/list")
+    @SaCheckPermission("system:construct:list")
+    public CommonResult<List<ConstructVO>> list(@RequestBody @Valid ConstructBO constructBO) {
+        return success(iConstruct.selectList(constructBO));
+    }
+
+    /**
+     * 查询部件详情信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/selectOne")
+    public CommonResult<List<ConstructVO>> selectOne(String id) {
+        return success(iConstruct.selectOne(id));
+    }
+
+    /**
+     * 删除构型信息
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/delete")
+    @SaCheckPermission("system:construct:delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> ids) {
+        boolean result = iConstruct.delete(ids);
+        if (!result) {
+            return fail("删除构型失败！");
+        }
+        return success();
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param constructBO
+     * @return
+     */
+    @PostMapping("/add")
+    @SaCheckPermission("system:config:add")
+    public CommonResult<String> add(@RequestBody @Valid ConstructBO constructBO) {
+        if (iConstruct.hasKeyByKey(constructBO.getId())) {
+            return fail("构型已存在！");
+        }
+        boolean result = iConstruct.insert(constructBO);
+        if (!result) {
+            return fail("新增失败！");
+        }
+        return success();
+    }
+
+    /**
+     * 查询树结构
+     *
+     * @param constructBO
+     * @return
+     */
+    @GetMapping("/tree")
+    public CommonResult<List<Tree<String>>> tree(ConstructBO constructBO) {
+        return success(iConstruct.selectTree(constructBO));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param constructBO
+     * @return
+     */
+    @PutMapping("/edit")
+    @SaCheckPermission("system:construct:edit")
+    public CommonResult<Void> edit(@RequestBody @Valid ConstructBO constructBO) {
+        boolean result = iConstruct.update(constructBO);
+        if (result) {
+            return fail("更新客户端失败！");
+        }
+        return success();
+    }
+
+    @SaCheckPermission("system:construct:import")
+    @PostMapping("/template")
+    public void downTemplate(HttpServletResponse response) {
+        ExcelUtils.exportExcel(new ArrayList<>(), "参数配置模板", ConstructImport.class, response);
+    }
+
+    @SaCheckPermission("system:construct:import")
+    @PostMapping("/import")
+    public CommonResult<Valid> importData(MultipartFile file, boolean isCover) throws IOException {
+        ExcelResult<ConstructImport> result = ExcelUtils.importExcel(file.getInputStream(), ConstructImport.class, new ConstructImportListener(isCover));
+        System.out.println(result.getList());
+        return success(result.getAnalysis());
+    }
+
+    @SaCheckPermission(value = "system:construct:export")
+    @PostMapping("/export")
+    public void export(ConstructBO configBO, HttpServletResponse response) {
+        List<ConstructVO> list = iConstruct.selectList(configBO);
+        ExcelUtils.exportExcel(list, "参数配置", ConstructVO.class, response);
+    }
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/Config.java → eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/FaultPO.java

@@ -5,9 +5,6 @@ import com.mybatisflex.annotation.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.vip.orm.domain.BaseEntity;
-
-import java.io.Serial;
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -18,10 +15,10 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Table(value = "als_fault_statistics_t")
-public class Config extends BaseEntity implements Serializable {
+public class FaultPO extends BaseEntity {
+
+
 
-    @Serial
-    private static final long serialVersionUID = 1L;
 
     /** 编号 */
     @Id
@@ -208,7 +205,7 @@ public class Config extends BaseEntity implements Serializable {
     private String repairStatus;
 
     /** 备注 */
-    private String remarks;
+    private String remark;
 
     /** 删除标识（1删除 0未删除） */
 //    private Integer delFlag;

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/pojo/ConfigBO.java → eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/pojo/FaultBO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.eco.vip.orm.domain.BaseBO;
-import org.eco.vip.reliability.ser.domain.configuration.Config;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
 
 import java.util.Date;
 
@@ -18,9 +18,9 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Config.class, reverseConvertGenerate = false)
+@AutoMapper(target = FaultPO.class, reverseConvertGenerate = false)
 @Accessors(chain = true)
-public class ConfigBO extends BaseBO {
+public class FaultBO extends BaseBO {
 
     /**
      * 编号
@@ -29,7 +29,7 @@ public class ConfigBO extends BaseBO {
     private Long id;
 
     /**
-     * 日期
+     * 日期F
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date statisticsDate;
@@ -346,14 +346,21 @@ public class ConfigBO extends BaseBO {
      */
     private String repairStatus;
 
-    /**
-     * 备注
-     */
-    private String remarks;
-
-
     /**
      * 去重字段
      */
     private String distinctField;
+
+    private String endTime;
+
+    private String upTime;
+
+    private String model;
+
+    private String system;
+
+    private String aircraftSystem;
+
+    private String component;
+
 }

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/pojo/ConfigVO.java → eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/configuration/pojo/FaultVO.java

@@ -7,10 +7,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.vip.orm.domain.BaseEntity;
-import org.eco.vip.reliability.ser.domain.configuration.Config;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
 
-import java.io.Serial;
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -21,12 +19,10 @@ import java.util.Date;
 @Data
 @ExcelIgnoreUnannotated
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Config.class)
-public class ConfigVO extends BaseEntity implements Serializable {
+@AutoMapper(target = FaultPO.class)
+public class FaultVO extends BaseEntity {
 
 
-    @Serial
-    private static final long serialVersionUID = 1L;
 
     /** 编号 */
 //    @ExcelProperty(value = "编号")
@@ -276,13 +272,6 @@ public class ConfigVO extends BaseEntity implements Serializable {
     @ExcelProperty(value = "维修状态")
     private String repairStatus;
 
-    /** 备注 */
-    @ExcelProperty(value = "备注")
-    private String remarks;
-
-    /** 删除标识（1删除 0未删除） */
-//    @ExcelProperty(value = "删除标识（1删除 0未删除）")
-    private Integer delFlag;
 
 
     /**

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/construct/ConstructPO.java

@@ -0,0 +1,68 @@
+package org.eco.vip.reliability.ser.domain.construct;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.vip.orm.domain.BaseEntity;
+
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.domain.construct
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table(value = "aircraft_info")
+public class ConstructPO extends BaseEntity {
+    /**
+     * 主键ID
+     */
+    @Id
+    private String id;
+//    /**
+//     * 机型
+//     */
+//    private String model;
+//    /**
+//     * 系统
+//     */
+//    private Long system;
+//    /**
+//     * 子系统
+//     */
+//    private String aircraftSystem;
+//    /**
+//     * 部件
+//     */
+//    private String component;
+//    /**
+//     * 数量
+//     */
+//    private String countNumber;
+    /**
+     * 父节点ID
+     */
+    private String parentId;
+    /**
+     * 构型名称
+     */
+    private String configName;
+    /**
+     * 构型类型：model-机型、system-系统、component-部件
+     */
+    private String configType;
+    /**
+     * 部件数量
+     */
+    private Integer configLevel;
+    /**
+     * 节点层级（1-机型，2-系统，3-子系统 4-部件）
+     */
+    private Integer countNum;
+    /**
+     * 构型编码（唯一标识）
+     */
+    private String specification;
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/construct/pojo/AircraftTreeNode.java

@@ -0,0 +1,27 @@
+package org.eco.vip.reliability.ser.domain.construct.pojo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-05
+ * @Belongpackage org.eco.vip.reliability.ser.domain.construct.pojo
+ */
+@Data
+public class AircraftTreeNode {
+
+    // 节点ID
+    private String id;
+    // 节点名称
+    private String name;
+    // 节点类型：model, system, aircraftSystem, component
+    private String type;
+    // 数量（仅部件节点有值）
+    private String countNumber;
+    // 子节点列表
+    private List<AircraftTreeNode> children= new ArrayList<>();
+
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/construct/pojo/ConstructBO.java

@@ -0,0 +1,83 @@
+package org.eco.vip.reliability.ser.domain.construct.pojo;
+
+import com.mybatisflex.annotation.Id;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.eco.vip.orm.domain.BaseBO;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
+
+import java.util.List;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.domain.construct.pojo
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultPO.class, reverseConvertGenerate = false)
+@Accessors(chain = true)
+public class ConstructBO extends BaseBO {
+    /**
+     * ID
+     */
+    private String id;
+//    /**
+//     * 机型
+//     */
+//    private String model;
+//    /**
+//     * 系统
+//     */
+//    private String system;
+//    /**
+//     * 子系统
+//     */
+//    private String aircraftSystem;
+//    /**
+//     * 部件
+//     */
+//    private String component;
+//    /**
+//     * 数量
+//     */
+//    private String countNumber;
+    /**
+     * 父节点ID
+     */
+    private String parentId;
+    /**
+     * 构型名称
+     */
+    private String configName;
+    /**
+     * 子节点
+     */
+    private String aircraftNo;
+    /**
+     * 构型类型：model-机型、system-系统、component-部件
+     */
+    private String configType;
+    /**
+     * 部件数量
+     */
+    private Integer configLevel;
+    /**
+     * 节点层级（1-机型，2-系统，3-子系统 4-部件）
+     */
+    private Integer countNum;
+    /**
+     * 构型编码（唯一标识）
+     */
+    private String specification;
+    /**
+     * 父节点
+     */
+    private ConstructVO parent;
+    /**
+     * 树结构子节点
+     */
+    private List<ConstructVO> children;
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/construct/pojo/ConstructImport.java

@@ -0,0 +1,78 @@
+package org.eco.vip.reliability.ser.domain.construct.pojo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import com.mybatisflex.annotation.Id;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.domain.construct.pojo
+ */
+
+@Data
+@NoArgsConstructor
+public class ConstructImport implements Serializable {
+
+    /**
+     * 主键ID
+     */
+//    @ExcelProperty(value = "ID")
+//    private Long id;
+//    /**
+//     * 父节点ID
+//     */
+//    @ExcelProperty(value = "机型")
+//    private String model;
+//    /**
+//     * 构型名称
+//     */
+//    @ExcelProperty(value = "系统")
+//    private String system;
+//    /**
+//     * 子系统
+//     */
+//    @ExcelProperty(value = "子系统")
+//    private String aircraftSystem;
+//    /**
+//     * 部件
+//     */
+//    @ExcelProperty(value = "部件")
+//    private String component;
+//    /**
+//     * 数量
+//     */
+//    @ExcelProperty(value = "数量")
+//    private String countNumber;
+    /**
+     * 父节点ID
+     */
+    private Long parentId;
+    /**
+     * 构型名称
+     */
+    private String configName;
+    /**
+     * 子节点
+     */
+    private String aircraftNo;
+    /**
+     * 构型类型：model-机型、system-系统、component-部件
+     */
+    private String configType;
+    /**
+     * 部件数量
+     */
+    private Integer configLevel;
+    /**
+     * 节点层级（1-机型，2-系统，3-子系统 4-部件）
+     */
+    private Integer countNum;
+    /**
+     * 构型编码（唯一标识）
+     */
+    private String specification;
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/construct/pojo/ConstructVO.java

@@ -0,0 +1,92 @@
+package org.eco.vip.reliability.ser.domain.construct.pojo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.mybatisflex.annotation.Id;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.vip.orm.domain.BaseEntity;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
+import org.eco.vip.reliability.ser.domain.construct.ConstructPO;
+
+import java.util.List;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.domain.construct.pojo
+ */
+@Data
+@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ConstructPO.class)
+public class ConstructVO extends BaseEntity {
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+//    /**
+//     * 父节点ID
+//     */
+//    @ExcelProperty(value = "机型")
+//    private String model;
+//    /**
+//     * 构型名称
+//     */
+//    @ExcelProperty(value = "系统")
+//    private String system;
+//    /**
+//     * 子系统
+//     */
+//    @ExcelProperty(value = "子系统")
+//    private String aircraftSystem;
+//    /**
+//     * 部件
+//     */
+//    @ExcelProperty(value = "部件")
+//    private String component;
+//    /**
+//     * 数量
+//     */
+//    @ExcelProperty(value = "数量")
+//    private String countNumber;
+    /**
+     * 父节点ID
+     */
+    private String parentId;
+    /**
+     * 构型名称
+     */
+    private String configName;
+    /**
+     * 子节点
+     */
+    private String aircraftNo;
+    /**
+     * 构型类型：model-机型、system-系统、component-部件
+     */
+    private String configType;
+    /**
+     * 部件数量
+     */
+    private Integer configLevel;
+    /**
+     * 节点层级（1-机型，2-系统，3-子系统 4-部件）
+     */
+    private Integer countNum;
+    /**
+     * 构型编码（唯一标识）
+     */
+    private String specification;
+    /**
+     * 父节点
+     */
+    private ConstructVO parent;
+    /**
+     * 树结构子节点
+     */
+    private List<ConstructVO> children;
+
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/maintrel/Maintrel.java

@@ -1,13 +0,0 @@
-package org.eco.vip.reliability.ser.domain.maintrel;
-
-import lombok.Data;
-import org.eco.vip.orm.domain.BaseEntity;
-
-/**
- * @Author: wyj
- * @CreateTime: 2025-07-28
- * @Belongpackage org.eco.vip.reliability.ser.domain.maintrel
- */
-@Data
-public class Maintrel extends BaseEntity {
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/maintrel/pojo/MaintrelVO.java

@@ -1,13 +0,0 @@
-package org.eco.vip.reliability.ser.domain.maintrel.pojo;
-
-import lombok.Data;
-import org.eco.vip.orm.domain.BaseEntity;
-
-/**
- * @Author: wyj
- * @CreateTime: 2025-07-28
- * @Belongpackage org.eco.vip.reliability.ser.domain.maintrel.pojo
- */
-@Data
-public class MaintrelVO extends BaseEntity {
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/domain/maintrel/pojo/maintrelBO.java

@@ -1,13 +0,0 @@
-package org.eco.vip.reliability.ser.domain.maintrel.pojo;
-
-import lombok.Data;
-import org.eco.vip.orm.domain.BaseBO;
-
-/**
- * @Author: wyj
- * @CreateTime: 2025-07-28
- * @Belongpackage org.eco.vip.reliability.ser.domain.maintrel.pojo
- */
-@Data
-public class maintrelBO extends BaseBO {
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/listener/ConstructImportListener.java

@@ -0,0 +1,56 @@
+package org.eco.vip.reliability.ser.listener;
+
+import cn.idev.excel.context.AnalysisContext;
+import cn.idev.excel.event.AnalysisEventListener;
+import org.eco.vip.core.utils.BeanUtils;
+import org.eco.vip.core.utils.ObjUtils;
+import org.eco.vip.core.utils.SpringUtils;
+import org.eco.vip.core.utils.ValidatorUtils;
+import org.eco.vip.excel.core.ExcelListener;
+import org.eco.vip.excel.core.ExcelResult;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructBO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructImport;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructVO;
+import org.eco.vip.reliability.ser.service.construct.IConstruct;
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.listener
+ */
+public class ConstructImportListener extends AnalysisEventListener<ConstructImport> implements ExcelListener<ConstructImport> {
+
+
+    private final IConstruct iConstruct;
+    private final boolean isCover;
+
+    public ConstructImportListener(boolean isCover) {
+        this.isCover = isCover;
+        this.iConstruct = SpringUtils.getBean(IConstruct.class);
+    }
+
+    @Override
+    public void invoke(ConstructImport constructImport, AnalysisContext analysisContext) {
+        ConstructBO configBO = BeanUtils.toBean(constructImport, ConstructBO.class);
+        ConstructVO configVO = iConstruct.selectById(configBO.getId());
+        if (ObjUtils.isEmpty(configVO)) {
+            ValidatorUtils.validate(configBO);
+            iConstruct.insert(configBO);
+        } else if (isCover) {
+            configBO.setVersion(configVO.getVersion());
+            iConstruct.update(configBO);
+        }
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+
+    }
+
+    @Override
+    public ExcelResult<ConstructImport> getExcelResult() {
+        return null;
+    }
+
+
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/mapper/ConfigMapper.java

@@ -1,9 +0,0 @@
-package org.eco.vip.reliability.ser.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import org.eco.vip.reliability.ser.domain.configuration.Config;
-import org.mapstruct.Mapper;
-
-@Mapper
-public interface ConfigMapper extends BaseMapper<Config> {
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/mapper/ConstructMapper.java

@@ -0,0 +1,12 @@
+package org.eco.vip.reliability.ser.mapper;
+import com.mybatisflex.core.BaseMapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.eco.vip.reliability.ser.domain.construct.ConstructPO;
+
+/**\
+ * wyj
+ */
+@Mapper
+public interface ConstructMapper extends BaseMapper<ConstructPO> {
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/mapper/FaultMapper.java

@@ -0,0 +1,11 @@
+package org.eco.vip.reliability.ser.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
+
+
+@Mapper
+public interface FaultMapper extends BaseMapper<FaultPO> {
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/service/config/IConfigService.java

@@ -1,20 +0,0 @@
-package org.eco.vip.reliability.ser.service.config;
-
-import org.eco.vip.orm.service.IBaseService;
-import org.eco.vip.reliability.ser.domain.configuration.Config;
-import org.eco.vip.reliability.ser.domain.configuration.pojo.ConfigBO;
-
-import java.util.List;
-
-/**
- * wyj
- */
-public interface IConfigService extends IBaseService<Config> {
-
-    boolean saveBatch(List<ConfigBO> configBos);
-
-    /**
-     * 查询故障统计数量，同步
-     */
-    void getExtraStatistics();
-}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/service/config/IFaultService.java

@@ -0,0 +1,54 @@
+package org.eco.vip.reliability.ser.service.config;
+
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.orm.service.IBaseService;
+import org.eco.vip.reliability.ser.domain.configuration.FaultPO;
+import org.eco.vip.reliability.ser.domain.configuration.pojo.FaultBO;
+import org.eco.vip.reliability.ser.domain.configuration.pojo.FaultVO;
+
+
+import java.util.List;
+
+/**
+ * wyj
+ */
+public interface IFaultService extends IBaseService<FaultPO> {
+    /**
+     * 批量新增
+     * @param configBos
+     * @return
+     */
+    boolean saveBatch(List<FaultBO> configBos);
+
+    /**
+     * 查询故障统计数量，同步
+     */
+    void getExtraStatistics();
+
+    /**
+     * 分页查询数据
+     * @param faultBO
+     * @return
+     */
+    PageResult<FaultVO> selectPage(FaultBO faultBO);
+
+    /**
+     * 查询列表信息
+     * @param faultBO
+     * @return
+     */
+    List<FaultVO> selectList(FaultBO faultBO);
+    /**
+     * 删除构型信息
+     * @param ids
+     * @return
+     */
+    boolean delete(List<String> ids);
+
+    /**
+     * 修改构型信息
+     * @param faultBO
+     * @return
+     */
+    boolean update(FaultBO faultBO);
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/service/construct/ConstructImpl.java

@@ -0,0 +1,204 @@
+package org.eco.vip.reliability.ser.service.construct;
+
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.core.utils.*;
+import org.eco.vip.orm.domain.PageQuery;
+import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.reliability.ser.domain.construct.ConstructPO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructBO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructVO;
+import org.eco.vip.reliability.ser.mapper.ConstructMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.eco.vip.reliability.ser.domain.construct.table.ConstructPOTableDef.CONSTRUCT_PO;
+
+
+/**
+ * @Author: wyj
+ * @CreateTime: 2025-08-04
+ * @Belongpackage org.eco.vip.reliability.ser.service.construct
+ */
+@Service
+@Slf4j
+public class ConstructImpl extends BaseService<ConstructMapper, ConstructPO> implements IConstruct {
+
+
+    private QueryWrapper buidQueryWapper(ConstructBO bo) {
+        return buildBaseQueryWrapper().and(CONSTRUCT_PO.ID.eq(bo.getId()))
+                .and(CONSTRUCT_PO.PARENT_ID.eq(bo.getParentId()))
+                .and(CONSTRUCT_PO.CONFIG_NAME.eq(bo.getConfigName()));
+
+    }
+
+    /**
+     * 查询凡所有父节点信息
+     * @param id
+     * @return
+     */
+    @Override
+    public List<ConstructVO> selectOne(String id) {
+        ArrayList<ConstructVO> treeList = new ArrayList<>();
+        String parentId = id;
+        while (true){
+            ConstructVO constructVO = selectTreeNode(parentId);
+            if(ObjUtils.isEmpty(constructVO)){
+                break;
+            }
+            String parent = constructVO.getParentId();
+            if (parent == null) {
+                break;
+            }
+            ConstructVO treeNode = selectTreeNode(parent);
+            if(ObjUtils.isEmpty(treeNode)){
+                break;
+            }
+            treeList.add(treeNode);
+            parentId = parent;
+        }
+        return treeList;
+    }
+
+    public ConstructVO selectTreeNode(String id){
+        QueryWrapper where = query().where(CONSTRUCT_PO.ID.eq(id));
+        ConstructVO oneAs = this.getOneAs(where, ConstructVO.class);
+        return oneAs;
+    }
+
+    /**
+     * 分页查询数据库
+     *
+     * @param constructBO
+     * @return
+     */
+    @Override
+    public PageResult<ConstructVO> selectPage(ConstructBO constructBO) {
+        QueryWrapper wrapper = buidQueryWapper(constructBO);
+        Page<ConstructVO> page = mapper.paginateWithRelationsAs(PageQuery.build(), wrapper, ConstructVO.class);
+        return PageResult.build(page);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @Override
+    public boolean delete(List<String> ids) {
+        return this.removeByIds(ids);
+    }
+
+
+    /**
+     * 查询构型是否存在
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean hasKeyByKey(String id) {
+        ConstructVO constructVO = this.selectById(id);
+        return !ObjUtils.isNotEmpty(constructVO);
+    }
+
+    /**
+     * 查询树结构（按机型->系统->部件层级展示，不进行分页）
+     *
+     * @param constructBO 包含查询条件的BO对象
+     * @return 完整的树结构数据
+     */
+    @Override
+    public List<Tree<String>> selectTree(ConstructBO constructBO) {
+        QueryWrapper wrapper = QueryWrapper.create()
+                .eq(ConstructPO::getDelFlag, 0)
+                .eq(ConstructPO::getStatus, 1);
+        List<ConstructPO> aircraftList = this.list(wrapper);
+        return TreeUtils.build(
+                aircraftList.stream().map(aircraft ->
+                        new TreeNode<>(aircraft.getId(),aircraft.getParentId(),aircraft.getConfigName(),aircraft.getCountNum()
+                        ).setExtra(JsonUtils.parseObj(aircraft))
+                ).collect(Collectors.toList()),
+                null
+        );
+    }
+
+    /**
+     * 递归构建树形结构（保持不变）
+     *
+     * @param allNodes 所有节点列表
+     * @param parentId 父节点ID（顶级节点为null）
+     * @return 组装好的树形节点列表
+     */
+    private List<ConstructVO> buildTree(List<ConstructVO> allNodes, Long parentId) {
+        return allNodes.stream()
+                .filter(node -> Objects.equals(node.getParentId(), parentId))
+                .peek(node -> node.setChildren(buildTree(allNodes, node.getId())))
+                .sorted(Comparator.comparing(ConstructVO::getConfigName))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取List
+     *
+     * @param configBO
+     * @return
+     */
+    @Override
+    public List<ConstructVO> selectList(ConstructBO configBO) {
+        QueryWrapper wrapper = buidQueryWapper(configBO);
+        List<ConstructVO> constructPOS = mapper.selectListWithRelationsByQueryAs(wrapper, ConstructVO.class);
+        return constructPOS;
+    }
+
+    /**
+     * ‘
+     * 查询一条数据
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ConstructVO selectById(String id) {
+        ConstructBO bo = new ConstructBO();
+        bo.setId(id);
+        QueryWrapper wrapper = buidQueryWapper(bo);
+        ConstructVO constructVO = mapper.selectOneByQueryAs(wrapper, ConstructVO.class);
+        return constructVO;
+    }
+
+    /**
+     * 新增
+     *
+     * @param configBO
+     * @return
+     */
+    @Override
+    public boolean insert(ConstructBO configBO) {
+        ConstructPO convert = MapstructUtils.convert(configBO, ConstructPO.class);
+        return this.save(convert);
+    }
+
+    /**
+     * 修改信息
+     *
+     * @param configBO
+     * @return
+     */
+    @Override
+    public boolean update(ConstructBO configBO) {
+        ConstructPO po = new ConstructPO();
+        po.setCountNum(configBO.getCountNum());
+        po.setId(configBO.getId());
+        po.setVersion(1);
+        return this.updateById(po);
+    }
+
+}

eco-reliability/reliability-service/src/main/java/org/eco/vip/reliability/ser/service/construct/IConstruct.java

@@ -0,0 +1,93 @@
+package org.eco.vip.reliability.ser.service.construct;
+
+
+import cn.hutool.core.lang.tree.Tree;
+import org.eco.vip.core.pojo.PageResult;
+import org.eco.vip.orm.service.IBaseService;
+import org.eco.vip.reliability.ser.domain.construct.ConstructPO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructBO;
+import org.eco.vip.reliability.ser.domain.construct.pojo.ConstructVO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * wyj
+ */
+public interface IConstruct extends IBaseService<ConstructPO> {
+    /**
+     * 获取List
+     *
+     * @param configBO
+     * @return
+     */
+    List<ConstructVO> selectList(ConstructBO configBO);
+
+    /**
+     * ‘
+     * 查询一条数据
+     *
+     * @param id
+     * @return
+     */
+    ConstructVO selectById(String id);
+
+    /**
+     * 新增
+     *
+     * @param configBO
+     * @return
+     */
+    boolean insert(ConstructBO configBO);
+
+    /**
+     * 修改信息
+     *
+     * @param configBO
+     * @return
+     */
+    boolean update(ConstructBO configBO);
+
+    /**
+     * 分页查询数据库
+     *
+     * @param constructBO
+     * @return
+     */
+    PageResult<ConstructVO> selectPage(ConstructBO constructBO);
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    boolean delete(List<String> ids);
+
+    /**
+     * 查询构型是否存在
+     *
+     * @param id
+     * @return
+     */
+    boolean hasKeyByKey(String id);
+
+    /**
+     * 查询树结构
+     *
+     * @param constructBO
+     * @return
+     */
+//    List<ConstructVO> selectTree(ConstructBO constructBO);
+
+
+    List<Tree<String>> selectTree(ConstructBO constructBO);
+
+    /**
+     * 查询部件详情信息
+     *
+     * @param id
+     * @return
+     */
+    List<ConstructVO> selectOne(String id);
+}

eco-start/pom.xml

@@ -17,6 +17,11 @@
             <artifactId>nexus-core-biz</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eco.vip</groupId>
+            <artifactId>reliability-service</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
     <build>