From 25e573d2c994986a5ace2f7fa00ca63029df8689 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 17 Jul 2025 17:02:51 +0800 Subject: [PATCH] =?UTF-8?q?cf-framework=EF=BC=9Adict=E7=A7=BB=E5=88=B0star?= =?UTF-8?q?ter-excel=E3=80=81=E5=8D=87=E7=BA=A7easyexcel=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cf-dependencies/pom.xml | 15 ++--- .../cf-spring-boot-starter-biz-dict/pom.xml | 56 ------------------- .../core/util/DictFrameworkUtilsTest.java | 49 ---------------- .../cf-spring-boot-starter-excel/pom.xml | 27 ++++++++- .../config/ChenfengDictAutoConfiguration.java | 0 .../ChenfengDictRpcAutoConfiguration.java | 0 .../framework/dict/core/package-info.java | 0 .../dict/core/util/DictFrameworkUtils.java | 0 .../cf/imes/framework/dict/package-info.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 cf-framework/pom.xml | 1 - .../cf-module-prod-executor-biz/pom.xml | 8 --- .../cf-module-prod-plan-biz/pom.xml | 9 --- cf-module-system/cf-module-system-biz/pom.xml | 10 +--- 14 files changed, 35 insertions(+), 140 deletions(-) delete mode 100644 cf-framework/cf-spring-boot-starter-biz-dict/pom.xml delete mode 100644 cf-framework/cf-spring-boot-starter-biz-dict/src/test/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtilsTest.java rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictAutoConfiguration.java (100%) rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictRpcAutoConfiguration.java (100%) rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/java/com/cf/imes/framework/dict/core/package-info.java (100%) rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtils.java (100%) rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/java/com/cf/imes/framework/dict/package-info.java (100%) rename cf-framework/{cf-spring-boot-starter-biz-dict => cf-spring-boot-starter-excel}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) diff --git a/cf-dependencies/pom.xml b/cf-dependencies/pom.xml index 4ee4ac68c..7420aaf0a 100644 --- a/cf-dependencies/pom.xml +++ b/cf-dependencies/pom.xml @@ -59,7 +59,7 @@ 1.18.30 1.5.5.Final 5.8.25 - 3.3.3 + 4.0.3 2.3 1.0.5 1.2.83 @@ -75,7 +75,8 @@ 3.5.0 4.11.0 - 2.15.1 + 2.17.0 + 1.27.1 8.5.7 4.6.4 2.2.1 @@ -143,11 +144,6 @@ - - com.cf.imes - cf-spring-boot-starter-biz-dict - ${revision} - com.cf.imes cf-spring-boot-starter-biz-sms @@ -539,6 +535,11 @@ commons-io ${commons-io.version} + + org.apache.commons + commons-compress + ${commons-compress.version} + org.apache.tika diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/pom.xml b/cf-framework/cf-spring-boot-starter-biz-dict/pom.xml deleted file mode 100644 index 480e0d3e6..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-dict/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - com.cf.imes - cf-framework - ${revision} - - 4.0.0 - cf-spring-boot-starter-biz-dict - jar - - ${project.artifactId} - 字典类型、数据 - - - - com.cf.imes - cf-common - - - - - org.springframework.boot - spring-boot-starter - - - - - com.cf.imes - cf-spring-boot-starter-rpc - true - - - - - com.cf.imes - cf-module-system-api - ${revision} - - - - - com.google.guava - guava - - - - - com.cf.imes - cf-spring-boot-starter-test - test - - - diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/test/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtilsTest.java b/cf-framework/cf-spring-boot-starter-biz-dict/src/test/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtilsTest.java deleted file mode 100644 index e89a86763..000000000 --- a/cf-framework/cf-spring-boot-starter-biz-dict/src/test/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtilsTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cf.imes.framework.dict.core.util; - -import com.cf.imes.framework.common.enums.CommonStatusEnum; -import com.cf.imes.framework.test.core.ut.BaseMockitoUnitTest; -import com.cf.imes.module.system.api.dict.DictDataApi; -import com.cf.imes.module.system.api.dict.dto.DictDataRespDTO; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.Mock; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; -import static com.cf.imes.framework.test.core.util.RandomUtils.randomPojo; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; - -/** - * {@link DictFrameworkUtils} 的单元测试 - */ -public class DictFrameworkUtilsTest extends BaseMockitoUnitTest { - - @Mock - private DictDataApi dictDataApi; - - @BeforeEach - public void setUp() { - DictFrameworkUtils.init(dictDataApi); - } - - @Test - public void testGetDictDataLabel() { - // mock 数据 - DictDataRespDTO dataRespDTO = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); - // mock 方法 - when(dictDataApi.getDictData(dataRespDTO.getDictType(), dataRespDTO.getValue())).thenReturn(success(dataRespDTO)); - // 断言返回值 - assertEquals(dataRespDTO.getLabel(), DictFrameworkUtils.getDictDataLabel(dataRespDTO.getDictType(), dataRespDTO.getValue())); - } - - @Test - public void testParseDictDataValue() { - // mock 数据 - DictDataRespDTO resp = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); - // mock 方法 - when(dictDataApi.parseDictData(resp.getDictType(), resp.getLabel())).thenReturn(success(resp)); - // 断言返回值 - assertEquals(resp.getValue(), DictFrameworkUtils.parseDictDataValue(resp.getDictType(), resp.getLabel())); - } - -} diff --git a/cf-framework/cf-spring-boot-starter-excel/pom.xml b/cf-framework/cf-spring-boot-starter-excel/pom.xml index aad401643..c9e493bb8 100644 --- a/cf-framework/cf-spring-boot-starter-excel/pom.xml +++ b/cf-framework/cf-spring-boot-starter-excel/pom.xml @@ -20,11 +20,24 @@ cf-common + + + org.springframework.boot + spring-boot-starter + + + + + com.cf.imes + cf-spring-boot-starter-rpc + true + + com.cf.imes - cf-spring-boot-starter-biz-dict - true + cf-module-system-api + ${revision} @@ -45,6 +58,16 @@ com.alibaba easyexcel + + + org.apache.commons + commons-compress + + + + com.google.guava + guava + diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictAutoConfiguration.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictAutoConfiguration.java similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictAutoConfiguration.java rename to cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictAutoConfiguration.java diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictRpcAutoConfiguration.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictRpcAutoConfiguration.java similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictRpcAutoConfiguration.java rename to cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/config/ChenfengDictRpcAutoConfiguration.java diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/core/package-info.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/core/package-info.java similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/core/package-info.java rename to cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/core/package-info.java diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtils.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtils.java similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtils.java rename to cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/core/util/DictFrameworkUtils.java diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/package-info.java b/cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/package-info.java similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/java/com/cf/imes/framework/dict/package-info.java rename to cf-framework/cf-spring-boot-starter-excel/src/main/java/com/cf/imes/framework/dict/package-info.java diff --git a/cf-framework/cf-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cf-framework/cf-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from cf-framework/cf-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to cf-framework/cf-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cf-framework/pom.xml b/cf-framework/pom.xml index 0fd718d05..126ca330f 100644 --- a/cf-framework/pom.xml +++ b/cf-framework/pom.xml @@ -28,7 +28,6 @@ cf-spring-boot-starter-test cf-spring-boot-starter-biz-operatelog - cf-spring-boot-starter-biz-dict cf-spring-boot-starter-biz-sms cf-spring-boot-starter-biz-pay diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml index 67d114b9d..7bec07920 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml @@ -24,10 +24,6 @@ cf-module-prod-executor-api ${revision} - - com.cf.imes - cf-spring-boot-starter-biz-dict - com.cf.imes @@ -216,10 +212,6 @@ com.cf.imes cf-spring-boot-starter-biz-data-permission - - com.cf.imes - cf-spring-boot-starter-biz-dict - com.cf.imes cf-spring-boot-starter-biz-operatelog diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/pom.xml b/cf-module-prod-plan/cf-module-prod-plan-biz/pom.xml index 43015482e..44bc4267b 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/pom.xml +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/pom.xml @@ -30,10 +30,6 @@ cf-module-prod-plan-api ${revision} - - com.cf.imes - cf-spring-boot-starter-biz-dict - @@ -227,10 +223,6 @@ com.cf.imes cf-spring-boot-starter-biz-id - - com.cf.imes - cf-spring-boot-starter-biz-dict - @@ -273,7 +265,6 @@ cf-spring-boot-starter-elasticsearch, cf-module-prod-executor-api, cf-spring-boot-starter-biz-id, - cf-spring-boot-starter-biz-dict, cf-spring-boot-starter-test diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index b44f4ef68..4eec4c9da 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -50,10 +50,7 @@ com.cf.imes cf-spring-boot-starter-biz-sms - - com.cf.imes - cf-spring-boot-starter-biz-dict - + com.cf.imes cf-spring-boot-starter-biz-organ @@ -247,10 +244,7 @@ com.cf.imes cf-module-system-api - - com.cf.imes - cf-spring-boot-starter-biz-dict - + com.cf.imes cf-spring-boot-starter-biz-ip