wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重命名 ruoyi-ccdi 模块为 ruoyi-info-collection

Browse Source 
- Maven 模块从 ruoyi-ccdi 重命名为 ruoyi-info-collection
- Java 包名从 com.ruoyi.ccdi 改为 com.ruoyi.info.collection
- MyBatis XML 命名空间同步更新
- 保留数据库表名、API URL、权限标识中的 ccdi 前缀
- 更新项目文档中的模块引用
This commit is contained in:
wkc
2026-02-24 17:12:11 +08:00
parent b126b43e2c
commit 1cd87d2695
206 changed files with 1339 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
doc/requirements/plans/2026-02-08-intermediary-import-upsert-implementation.md
View File

@@ -60,7 +60,7 @@ ALTER TABLE cdi_biz_intermediary ADD UNIQUE KEY uk_person_id (person_id);
### Task 1: 添加个人中介批量导入方法接口
**文件:**
- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java`
- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java`
**Step 1: 添加方法签名到接口**
@@ -81,7 +81,7 @@ void importPersonBatch(@Param("list") List<CcdiBizIntermediary> list);
```bash
cd .worktrees/intermediary-import-upsert
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
预期: 编译成功,无错误
@@ -89,7 +89,7 @@ mvn compile -pl ruoyi-ccdi -am
**Step 3: 提交**
```bash
git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java
git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java
git commit -m "feat: 添加个人中介批量导入方法签名
添加importPersonBatch方法到Mapper接口,用于支持ON DUPLICATE KEY UPDATE的批量导入操作。
@@ -102,7 +102,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 2: 实现个人中介批量导入SQL
**文件:**
- 修改: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml`
- 修改: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml`
**Step 1: 在XML文件中添加SQL实现**
@@ -137,7 +137,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
```bash
# 检查XML格式是否正确
xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml
xmllint --noout ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml
```
预期: 无输出表示格式正确
@@ -145,7 +145,7 @@ xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMap
**Step 3: 验证编译**
```bash
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
预期: 编译成功
@@ -153,7 +153,7 @@ mvn compile -pl ruoyi-ccdi -am
**Step 4: 提交**
```bash
git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml
git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml
git commit -m "feat: 实现个人中介批量导入ON DUPLICATE KEY UPDATE SQL
使用INSERT ... ON DUPLICATE KEY UPDATE实现单次SQL完成插入或更新操作。
@@ -169,7 +169,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 3: 添加实体中介批量导入方法接口
**文件:**
- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java`
- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java`
**Step 1: 添加方法签名到接口**
@@ -185,13 +185,13 @@ void importEntityBatch(@Param("list") List<CcdiEnterpriseBaseInfo> list);
**Step 2: 验证编译**
```bash
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
**Step 3: 提交**
```bash
git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java
git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java
git commit -m "feat: 添加实体中介批量导入方法签名
添加importEntityBatch方法到Mapper接口。
@@ -204,7 +204,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 4: 实现实体中介批量导入SQL
**文件:**
- 修改: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml`
- 修改: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml`
**Step 1: 在XML文件中添加SQL实现**
@@ -237,19 +237,19 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
**Step 2: 验证XML语法**
```bash
xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml
xmllint --noout ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml
```
**Step 3: 验证编译**
```bash
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
**Step 4: 提交**
```bash
git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml
git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml
git commit -m "feat: 实现实体中介批量导入ON DUPLICATE KEY UPDATE SQL
使用INSERT ... ON DUPLICATE KEY UPDATE实现单次SQL完成插入或更新操作。
@@ -266,7 +266,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 5: 重构个人中介导入Service - 更新模式
**文件:**
- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java`
- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java`
**Step 1: 修改 importPersonAsync 方法的核心导入逻辑**
@@ -361,13 +361,13 @@ private CcdiIntermediaryPersonExcel convertToExcel(CcdiBizIntermediary entity) {
**Step 4: 验证编译**
```bash
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
**Step 5: 提交**
```bash
git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java
git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java
git commit -m "refactor: 重构个人中介导入Service使用ON DUPLICATE KEY UPDATE
主要变更:
@@ -384,7 +384,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 6: 重构实体中介导入Service - 更新模式
**文件:**
- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java`
- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java`
**Step 1: 修改 importEntityAsync 方法的核心导入逻辑**
@@ -475,13 +475,13 @@ private CcdiIntermediaryEntityExcel convertToExcel(CcdiEnterpriseBaseInfo entity
**Step 4: 验证编译**
```bash
mvn compile -pl ruoyi-ccdi -am
mvn compile -pl ruoyi-info-collection -am
```
**Step 5: 提交**
```bash
git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java
git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java
git commit -m "refactor: 重构实体中介导入Service使用ON DUPLICATE KEY UPDATE
与个人中介导入保持一致的实现方式。
@@ -496,7 +496,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 7: 编写个人中介导入单元测试
**文件:**
- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java`
- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java`
**Step 1: 创建测试类**
@@ -643,7 +643,7 @@ class CcdiBizIntermediaryMapperTest {
**Step 2: 运行测试**
```bash
mvn test -pl ruoyi-ccdi -Dtest=CcdiBizIntermediaryMapperTest
mvn test -pl ruoyi-info-collection -Dtest=CcdiBizIntermediaryMapperTest
```
预期: 所有测试通过 (3 tests, 0 failures)
@@ -651,7 +651,7 @@ mvn test -pl ruoyi-ccdi -Dtest=CcdiBizIntermediaryMapperTest
**Step 3: 提交**
```bash
git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java
git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java
git commit -m "test: 添加个人中介批量导入单元测试
覆盖场景:
@@ -668,7 +668,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 8: 编写实体中介导入单元测试
**文件:**
- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java`
- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java`
**Step 1: 创建测试类**
@@ -797,7 +797,7 @@ class CcdiEnterpriseBaseInfoMapperTest {
**Step 2: 运行测试**
```bash
mvn test -pl ruoyi-ccdi -Dtest=CcdiEnterpriseBaseInfoMapperTest
mvn test -pl ruoyi-info-collection -Dtest=CcdiEnterpriseBaseInfoMapperTest
```
预期: 所有测试通过
@@ -805,7 +805,7 @@ mvn test -pl ruoyi-ccdi -Dtest=CcdiEnterpriseBaseInfoMapperTest
**Step 3: 提交**
```bash
git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java
git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java
git commit -m "test: 添加实体中介批量导入单元测试
覆盖场景与个人中介测试一致。
@@ -818,7 +818,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### Task 9: 集成测试 - 使用真实Excel文件
**文件:**
- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java`
- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java`
**Step 1: 创建集成测试**
@@ -927,13 +927,13 @@ class CcdiIntermediaryImportIntegrationTest {
**Step 2: 运行集成测试**
```bash
mvn test -pl ruoyi-ccdi -Dtest=CcdiIntermediaryImportIntegrationTest
mvn test -pl ruoyi-info-collection -Dtest=CcdiIntermediaryImportIntegrationTest
```
**Step 3: 提交**
```bash
git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java
git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java
git commit -m "test: 添加中介导入集成测试
测试端到端的导入流程,包括:
@@ -1011,7 +1011,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
```bash
cd .worktrees/intermediary-import-upsert
mvn test -pl ruoyi-ccdi
mvn test -pl ruoyi-info-collection
```
预期: 所有测试通过,包括新增的测试和现有的回归测试
@@ -1019,10 +1019,10 @@ mvn test -pl ruoyi-ccdi
**Step 2: 检查测试覆盖率(可选)**
```bash
mvn jacoco:report -pl ruoyi-ccdi
mvn jacoco:report -pl ruoyi-info-collection
```
查看覆盖率报告: `ruoyi-ccdi/target/site/jacoco/index.html`
查看覆盖率报告: `ruoyi-info-collection/target/site/jacoco/index.html`
**Step 3: 记录测试结果**
@@ -1082,7 +1082,7 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
```bash
# 运行代码检查(如果项目配置了checkstyle或spotbugs)
mvn checkstyle:check -pl ruoyi-ccdi
mvn checkstyle:check -pl ruoyi-info-collection
```
**Step 2: 检查未使用的导入**
@@ -1096,7 +1096,7 @@ mvn checkstyle:check -pl ruoyi-ccdi
**Step 4: 最终构建验证**
```bash
mvn clean package -pl ruoyi-ccdi -am -DskipTests
mvn clean package -pl ruoyi-info-collection -am -DskipTests
```
预期: 构建成功,生成jar文件
@@ -1174,10 +1174,10 @@ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
### 影响范围
**影响的模块:**
- `ruoyi-ccdi/mapper/CcdiBizIntermediaryMapper`
- `ruoyi-ccdi/mapper/CcdiEnterpriseBaseInfoMapper`
- `ruoyi-ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl`
- `ruoyi-ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl`
- `ruoyi-info-collection/mapper/CcdiBizIntermediaryMapper`
- `ruoyi-info-collection/mapper/CcdiEnterpriseBaseInfoMapper`
- `ruoyi-info-collection/service/impl/CcdiIntermediaryPersonImportServiceImpl`
- `ruoyi-info-collection/service/impl/CcdiIntermediaryEntityImportServiceImpl`
**不影响:**
- Controller层 (无变更)
@@ -1318,7 +1318,7 @@ git worktree remove .worktrees/intermediary-import-upsert
**实施完成后,请在worktree中运行:**
```bash
mvn clean package -pl ruoyi-ccdi -am
mvn clean package -pl ruoyi-info-collection -am
```
验证构建成功后,即可合并分支或创建Pull Request。