在modules包下新建asset-management包，将代码挪过来

Signed-off-by: CCass <only_pop@qq.com>
2026-04-04 23:37:32 +00:00 · 2025-09-28 18:02:12 +08:00
parent 2ed4e2a39a
commit 87fe29649a
31 changed files with 375 additions and 68 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -345,6 +345,18 @@
                <version>${revision}</version>
            </dependency>

+            <dependency>
+                <groupId>org.ruoyi</groupId>
+                <artifactId>ruoyi-asset-management-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.ruoyi</groupId>
+                <artifactId>ruoyi-asset-management</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
            <dependency>
                <groupId>org.ruoyi</groupId>
                <artifactId>ruoyi-generator</artifactId>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -57,6 +57,11 @@
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-asset-management</artifactId>
+        </dependency>
+
    </dependencies>

    <build>
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@ spring:
          driverClassName: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
-          password: root
+          password: 666666

      hikari:
        # 最大连接池数量
--- a/ruoyi-modules-api/pom.xml
+++ b/ruoyi-modules-api/pom.xml
@@ -17,6 +17,7 @@
        <module>ruoyi-chat-api</module>
        <module>ruoyi-knowledge-api</module>
        <module>ruoyi-system-api</module>
+        <module>ruoyi-asset-management-api</module>
    </modules>

    <properties>
--- a/ruoyi-modules-api/ruoyi-asset-management-api/pom.xml
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>ruoyi-ai</artifactId>
+        <groupId>org.ruoyi</groupId>
+        <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ruoyi-asset-management-api</artifactId>
+    <packaging>jar</packaging>
+
+    <description>
+        资产管理API模块
+    </description>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- 系统核心模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <!-- mybaits基础模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <!-- 脱敏模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <!-- excel模块-->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- 租户基础模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <!-- 字段翻译基础模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <!-- 日志模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- 对象映射工具 -->
+        <dependency>
+            <groupId>io.github.linpeilie</groupId>
+            <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>
+
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/AssetClassification.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/AssetClassification.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.asset.domain;

 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/MinUsagePeriod.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/MinUsagePeriod.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.asset.domain;

 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/bo/AssetClassificationBo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/bo/AssetClassificationBo.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.asset.domain.bo;

 import lombok.Data;
 import lombok.EqualsAndHashCode;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/bo/MinUsagePeriodBo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/bo/MinUsagePeriodBo.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.asset.domain.bo;

 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
 import org.ruoyi.core.domain.BaseEntity;
-import org.ruoyi.system.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.MinUsagePeriod;

 /**
 * 最低使用年限表业务对象 min_usage_period
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/AssetClassificationImportVo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/AssetClassificationImportVo.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.asset.domain.vo;

 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/AssetClassificationVo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/AssetClassificationVo.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.asset.domain.vo;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/MinUsagePeriodImportVo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/MinUsagePeriodImportVo.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.asset.domain.vo;

 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/MinUsagePeriodVo.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/domain/vo/MinUsagePeriodVo.java
@@ -1,10 +1,10 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.asset.domain.vo;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.system.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.MinUsagePeriod;

 import java.io.Serial;
 import java.io.Serializable;
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/mapper/AssetClassificationMapper.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/mapper/AssetClassificationMapper.java
@@ -1,9 +1,9 @@
-package org.ruoyi.system.mapper;
+package org.ruoyi.asset.mapper;

 import org.apache.ibatis.annotations.Param;
 import org.ruoyi.core.mapper.BaseMapperPlus;
-import org.ruoyi.system.domain.AssetClassification;
-import org.ruoyi.system.domain.vo.AssetClassificationVo;
+import org.ruoyi.asset.domain.AssetClassification;
+import org.ruoyi.asset.domain.vo.AssetClassificationVo;

 /**
 * 高等学校固定资产分类与代码Mapper接口
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/mapper/MinUsagePeriodMapper.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/mapper/MinUsagePeriodMapper.java
@@ -1,9 +1,9 @@
-package org.ruoyi.system.mapper;
+package org.ruoyi.asset.mapper;

 import org.apache.ibatis.annotations.Mapper;
 import org.ruoyi.core.mapper.BaseMapperPlus;
-import org.ruoyi.system.domain.MinUsagePeriod;
-import org.ruoyi.system.domain.vo.MinUsagePeriodVo;
+import org.ruoyi.asset.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodVo;

 /**
 * 最低使用年限表 数据层
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/service/IAssetClassificationService.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/service/IAssetClassificationService.java
@@ -1,9 +1,10 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.system.domain.AssetClassification;
-import org.ruoyi.system.domain.bo.AssetClassificationBo;
-import org.ruoyi.system.domain.vo.AssetClassificationVo;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.asset.domain.AssetClassification;
+import org.ruoyi.asset.domain.bo.AssetClassificationBo;
+import org.ruoyi.asset.domain.vo.AssetClassificationVo;

 import java.util.Collection;
 import java.util.List;
@@ -26,10 +27,15 @@ public interface IAssetClassificationService {
     */
    AssetClassification queryByClassificationCode(String classificationCode);

+    /**
+     * 根据分类名称查询
+     */
+    AssetClassification queryByClassificationName(String classificationName);
+
    /**
     * 查询高等学校固定资产分类与代码列表
     */
-    TableDataInfo<AssetClassificationVo> queryPageList(AssetClassificationBo bo);
+    TableDataInfo<AssetClassificationVo> queryPageList(AssetClassificationBo bo, PageQuery pageQuery);

    /**
     * 查询高等学校固定资产分类与代码列表
@@ -59,5 +65,5 @@ public interface IAssetClassificationService {
     * @param operName 操作用户
     * @return 结果
     */
-    String importData(List<AssetClassificationBo> dataList, Boolean isUpdateSupport, String operName);
+    String importData(List<AssetClassificationVo> dataList, Boolean isUpdateSupport, String operName);
 }
--- a/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/service/IMinUsagePeriodService.java
+++ b/ruoyi-modules-api/ruoyi-asset-management-api/src/main/java/org/ruoyi/asset/service/IMinUsagePeriodService.java
@@ -1,9 +1,9 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.system.domain.MinUsagePeriod;
-import org.ruoyi.system.domain.bo.MinUsagePeriodBo;
-import org.ruoyi.system.domain.vo.MinUsagePeriodVo;
+import org.ruoyi.asset.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.bo.MinUsagePeriodBo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodVo;
 import org.ruoyi.core.page.PageQuery;

 import java.util.Collection;
@@ -27,6 +27,11 @@ public interface IMinUsagePeriodService {
     */
    MinUsagePeriod queryByGbCode(String gbCode);

+    /**
+     * 根据国标代码前缀查询最低使用年限表
+     */
+    MinUsagePeriod queryByGbCodePrefix(String gbCodePrefix);
+
    /**
     * 查询最低使用年限表列表
     */
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -21,7 +21,8 @@
        <module>ruoyi-chat</module>
        <module>ruoyi-system</module>
        <module>ruoyi-generator</module>
-		 <module>ruoyi-wechat</module>
+        <module>ruoyi-wechat</module>
+        <module>ruoyi-asset-management</module>
    </modules>

    <properties>
--- a/ruoyi-modules/ruoyi-asset-management/pom.xml
+++ b/ruoyi-modules/ruoyi-asset-management/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.ruoyi</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ruoyi-asset-management</artifactId>
+
+    <description>
+        资产管理模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <!-- 资产管理API模块 -->
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-asset-management-api</artifactId>
+        </dependency>
+
+        <!-- Apache Commons IO -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <!-- 测试依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
+
--- a/ruoyi-modules/ruoyi-asset-management/src/main/java/org/ruoyi/asset/listener/MinUsagePeriodImportListener.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/main/java/org/ruoyi/asset/listener/MinUsagePeriodImportListener.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.listener;
+package org.ruoyi.asset.listener;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,10 +8,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.common.core.utils.SpringUtils;
 import org.ruoyi.common.excel.core.ExcelListener;
 import org.ruoyi.common.excel.core.ExcelResult;
-import org.ruoyi.system.domain.MinUsagePeriod;
-import org.ruoyi.system.domain.bo.MinUsagePeriodBo;
-import org.ruoyi.system.domain.vo.MinUsagePeriodImportVo;
-import org.ruoyi.system.service.IMinUsagePeriodService;
+import org.ruoyi.asset.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.bo.MinUsagePeriodBo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodImportVo;
+import org.ruoyi.asset.service.IMinUsagePeriodService;

 import java.util.ArrayList;
 import java.util.List;
--- a/ruoyi-modules/ruoyi-asset-management/src/main/java/org/ruoyi/asset/service/impl/MinUsagePeriodServiceImpl.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/main/java/org/ruoyi/asset/service/impl/MinUsagePeriodServiceImpl.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.service.impl;
+package org.ruoyi.asset.service.impl;

 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,11 +10,11 @@ import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.core.page.PageQuery;
 import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.system.domain.MinUsagePeriod;
-import org.ruoyi.system.domain.bo.MinUsagePeriodBo;
-import org.ruoyi.system.domain.vo.MinUsagePeriodVo;
-import org.ruoyi.system.mapper.MinUsagePeriodMapper;
-import org.ruoyi.system.service.IMinUsagePeriodService;
+import org.ruoyi.asset.domain.MinUsagePeriod;
+import org.ruoyi.asset.domain.bo.MinUsagePeriodBo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodVo;
+import org.ruoyi.asset.mapper.MinUsagePeriodMapper;
+import org.ruoyi.asset.service.IMinUsagePeriodService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -52,6 +52,16 @@ public class MinUsagePeriodServiceImpl implements IMinUsagePeriodService {
        return baseMapper.selectOne(lqw);
    }

+    /**
+     * 根据国标代码前缀查询最低使用年限表
+     */
+    @Override
+    public MinUsagePeriod queryByGbCodePrefix(String gbCodePrefix) {
+        LambdaQueryWrapper<MinUsagePeriod> lqw = Wrappers.lambdaQuery();
+        lqw.likeRight(MinUsagePeriod::getGbCode, gbCodePrefix);
+        return baseMapper.selectOne(lqw);
+    }
+
    /**
     * 查询最低使用年限表列表
     */
--- a/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/asset_classification.sql
+++ b/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/asset_classification.sql
@@ -0,0 +1,16 @@
+-- 高等学校固定资产分类与代码表
+CREATE TABLE `asset_classification` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `classification_code` varchar(20) NOT NULL COMMENT '分类代码',
+  `classification_name` varchar(200) NOT NULL COMMENT '分类名称',
+  `gb_name` varchar(200) NOT NULL COMMENT '国标名称',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_classification_code` (`classification_code`),
+  KEY `idx_classification_name` (`classification_name`),
+  KEY `idx_gb_name` (`gb_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='高等学校固定资产分类与代码表';
--- a/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/min_usage_period.sql
+++ b/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/min_usage_period.sql
@@ -0,0 +1,17 @@
+-- 最低使用年限表
+CREATE TABLE `min_usage_period` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `category` varchar(100) NOT NULL COMMENT '固定资产类别',
+  `content` varchar(200) NOT NULL COMMENT '内容',
+  `min_years` int(11) NOT NULL COMMENT '最低使用年限（年）',
+  `gb_code` varchar(20) NOT NULL COMMENT '国标代码',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_gb_code` (`gb_code`),
+  KEY `idx_category` (`category`),
+  KEY `idx_content` (`content`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='最低使用年限表';
--- a/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/scrap_audit.sql
+++ b/ruoyi-modules/ruoyi-asset-management/src/main/resources/sql/scrap_audit.sql
@@ -0,0 +1,27 @@
+-- 报废审核表
+CREATE TABLE `scrap_audit` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `serial_number` varchar(64) DEFAULT NULL COMMENT '序号',
+  `asset_number` varchar(64) NOT NULL COMMENT '资产编号',
+  `asset_name` varchar(255) NOT NULL COMMENT '资产名称',
+  `original_min_usage_period` int(11) DEFAULT NULL COMMENT '原始最低使用年限（年）',
+  `used_time` decimal(10,2) DEFAULT NULL COMMENT '已使用时间（年）',
+  `matched_classification_code` varchar(64) DEFAULT NULL COMMENT '匹配的分类代码',
+  `matched_classification_name` varchar(255) DEFAULT NULL COMMENT '匹配的分类名称',
+  `actual_min_usage_period` int(11) DEFAULT NULL COMMENT '实际最低使用年限（年）',
+  `is_scrap_eligible` tinyint(1) DEFAULT NULL COMMENT '是否达到报废标准',
+  `match_status` varchar(20) DEFAULT NULL COMMENT '匹配状态：SUCCESS-匹配成功，FAILED-匹配失败',
+  `judgment_basis` varchar(500) DEFAULT NULL COMMENT '判断依据',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_asset_number` (`asset_number`),
+  KEY `idx_asset_name` (`asset_name`),
+  KEY `idx_match_status` (`match_status`),
+  KEY `idx_is_scrap_eligible` (`is_scrap_eligible`),
+  KEY `idx_serial_number` (`serial_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='报废审核表';
+
--- a/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/ExcelImportSimpleTest.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/ExcelImportSimpleTest.java
@@ -1,9 +1,10 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import com.alibaba.excel.EasyExcel;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
-import org.ruoyi.system.domain.vo.MinUsagePeriodImportVo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodImportVo;
+

 import java.io.File;
 import java.io.FileInputStream;
--- a/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/NewExcelAnalysisTest.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/NewExcelAnalysisTest.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import com.alibaba.excel.EasyExcel;
 import lombok.extern.slf4j.Slf4j;
--- a/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleAssetClassificationTest.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleAssetClassificationTest.java
@@ -1,4 +1,4 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import com.alibaba.excel.EasyExcel;
 import lombok.extern.slf4j.Slf4j;
--- a/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleDatabaseTest.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleDatabaseTest.java
@@ -1,10 +1,9 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import com.alibaba.excel.EasyExcel;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
-import org.ruoyi.system.domain.MinUsagePeriod;
-import org.ruoyi.system.domain.vo.MinUsagePeriodImportVo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodImportVo;

 import java.io.File;
 import java.io.FileInputStream;
--- a/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleExcelImportTest.java
+++ b/ruoyi-modules/ruoyi-asset-management/src/test/java/org/ruoyi/asset/service/SimpleExcelImportTest.java
@@ -1,8 +1,8 @@
-package org.ruoyi.system.service;
+package org.ruoyi.asset.service;

 import com.alibaba.excel.EasyExcel;
 import lombok.extern.slf4j.Slf4j;
-import org.ruoyi.system.domain.vo.MinUsagePeriodImportVo;
+import org.ruoyi.asset.domain.vo.MinUsagePeriodImportVo;

 import java.io.File;
 import java.io.FileInputStream;
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -68,6 +68,11 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-asset-management-api</artifactId>
+            <scope>test</scope>
+        </dependency>

    </dependencies>

--- a/ruoyi-modules/ruoyi-system/src/test/resources/application-test.yml
+++ b/ruoyi-modules/ruoyi-system/src/test/resources/application-test.yml
@@ -1,5 +1,6 @@
 # 测试环境配置
 spring:
+  # 数据源配置
  datasource:
    type: com.zaxxer.hikari.HikariDataSource
    dynamic:
@@ -31,27 +32,45 @@ spring:
      database: 0
      timeout: 10S

-# MyBatis Plus配置
-mybatis-plus:
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  type-aliases-package: org.ruoyi.**.domain
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
-  global-config:
-    db-config:
-      id-type: AUTO
-      logic-delete-field: delFlag
-      logic-delete-value: 2
-      logic-not-delete-value: 0
+  # MyBatis Plus配置
+  mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: org.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+    configuration:
+      # 自动驼峰命名规则（camel case）映射
+      mapUnderscoreToCamelCase: true
+      # MyBatis 自动映射策略
+      # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
+      autoMappingBehavior: PARTIAL
+      # MyBatis 自动映射时未知列或未知属性处理策
+      # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
+      autoMappingUnknownColumnBehavior: NONE
+      # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
+      # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
+      # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
+      logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    global-config:
+      # 是否打印 Logo banner
+      banner: true
+      dbConfig:
+        # 主键类型
+        # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
+        idType: ASSIGN_ID
+        # 逻辑删除配置
+        logicDeleteField: delFlag
+        logicDeleteValue: 2
+        logicNotDeleteValue: 0
+        insertStrategy: NOT_NULL
+        updateStrategy: NOT_NULL
+        where-strategy: NOT_NULL

 # 日志配置
 logging:
  level:
-    org.ruoyi: DEBUG
-    org.springframework: WARN
-    com.baomidou.mybatisplus: WARN
-  pattern:
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n'
+    org.ruoyi: debug
+    org.springframework: warn
+    com.alibaba.excel: debug