From 05a6278d18baa9a3d72daa3e999b0aaa6bec4325 Mon Sep 17 00:00:00 2001 From: hewencai <2357300448@qq.com> Date: Wed, 29 Oct 2025 18:59:47 +0800 Subject: [PATCH] =?UTF-8?q?update:=E7=A7=BB=E5=8A=A8=E8=AE=A1=E9=87=8F?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-server/pom.xml | 5 - pom.xml | 1 - .../enums/UnitErrorCodeConstants.java | 0 .../QuantityUnitRelationController.java | 9 +- .../vo/CreateUnitWithRelationReqVO.java | 2 +- .../vo/DeleteUnitWithRelationReqVO.java | 2 +- .../QuantityUnitRelationBatchSaveReqVO.java | 2 +- .../vo/QuantityUnitRelationPageReqVO.java | 2 +- .../vo/QuantityUnitRelationRespVO.java | 2 +- .../vo/QuantityUnitRelationSaveReqVO.java | 2 +- .../UnitConversionController.java | 9 +- .../vo/BatchUnitConvertByNameReqVO.java | 2 +- .../vo/BatchUnitConvertBySymbolReqVO.java | 2 +- .../vo/BatchUnitConvertReqVO.java | 2 +- .../vo/BatchUnitConvertRespVO.java | 2 +- .../vo/UnitConversionPageReqVO.java | 2 +- .../vo/UnitConversionRespVO.java | 2 +- .../vo/UnitConversionSaveReqVO.java | 2 +- .../vo/UnitConversionValidationRespVO.java | 2 +- .../vo/UnitConvertByNameReqVO.java | 2 +- .../vo/UnitConvertBySymbolReqVO.java | 2 +- .../unitConversion}/vo/UnitConvertReqVO.java | 2 +- .../unitConversion}/vo/UnitConvertRespVO.java | 2 +- .../unitQuantity/UnitQuantityController.java | 9 +- .../vo/UnitQuantityPageReqVO.java | 2 +- .../unitQuantity/vo/UnitQuantityRespVO.java | 2 +- .../vo/UnitQuantitySaveReqVO.java | 2 +- .../vo/UnitQuantityTreeRespVO.java | 2 +- .../admin/untInfo}/UntInfoController.java | 9 +- .../admin/untInfo}/vo/UntInfoPageReqVO.java | 2 +- .../admin/untInfo}/vo/UntInfoRespVO.java | 2 +- .../admin/untInfo}/vo/UntInfoSaveReqVO.java | 2 +- .../QuantityUnitRelationMapper.java | 6 +- .../unitConversion}/UnitConversionMapper.java | 8 +- .../dao/unitQuantity/UnitQuantityMapper.java | 8 +- .../base/dal/dao/untInfo}/UntInfoMapper.java | 8 +- .../QuantityUnitRelationDO.java | 2 +- .../unitConversion}/UnitConversionDO.java | 2 +- .../unitQuantity/UnitQuantityDO.java | 2 +- .../dal/dataobject/untInfo}/UntInfoDO.java | 2 +- .../QuantityUnitRelationService.java | 7 +- .../QuantityUnitRelationServiceImpl.java | 16 +- .../UnitConversionHelperService.java | 16 +- .../UnitConversionService.java | 7 +- .../UnitConversionServiceImpl.java | 25 +- .../unitQuantity/UnitQuantityService.java | 7 +- .../unitQuantity/UnitQuantityServiceImpl.java | 19 +- .../base/service/untInfo}/UntInfoService.java | 7 +- .../service/untInfo}/UntInfoServiceImpl.java | 11 +- .../module/base}/util/UnitConversionUtil.java | 9 +- .../QuantityUnitRelationMapper.xml | 0 .../UnitConversion/UnitConversionMapper.xml | 0 .../unitQuantity/UnitQuantityMapper.xml | 0 .../unitmanagement}/untinfo/UntInfoMapper.xml | 0 zt-module-unit-management/pom.xml | 24 -- .../zt-module-unit-management-api/pom.xml | 46 --- .../zt-module-unit-management-server/pom.xml | 151 ---------- .../util/UnitConversionUtilTest.java | 264 ------------------ 58 files changed, 111 insertions(+), 628 deletions(-) rename {zt-module-unit-management/zt-module-unit-management-api => zt-module-base/zt-module-base-api}/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java (100%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/QuantityUnitRelationController.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/CreateUnitWithRelationReqVO.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/DeleteUnitWithRelationReqVO.java (87%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/QuantityUnitRelationBatchSaveReqVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/QuantityUnitRelationPageReqVO.java (88%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/QuantityUnitRelationRespVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation}/vo/QuantityUnitRelationSaveReqVO.java (90%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/UnitConversionController.java (95%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/BatchUnitConvertByNameReqVO.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/BatchUnitConvertBySymbolReqVO.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/BatchUnitConvertReqVO.java (89%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/BatchUnitConvertRespVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConversionPageReqVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConversionRespVO.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConversionSaveReqVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConversionValidationRespVO.java (97%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConvertByNameReqVO.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConvertBySymbolReqVO.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConvertReqVO.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion}/vo/UnitConvertRespVO.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/controller/admin/unitQuantity/UnitQuantityController.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java (91%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java (95%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo}/UntInfoController.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo}/vo/UntInfoPageReqVO.java (91%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo}/vo/UntInfoRespVO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo}/vo/UntInfoSaveReqVO.java (91%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation}/QuantityUnitRelationMapper.java (82%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion}/UnitConversionMapper.java (80%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/dal/dao/unitQuantity/UnitQuantityMapper.java (78%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo}/UntInfoMapper.java (77%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation}/QuantityUnitRelationDO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion}/UnitConversionDO.java (94%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/dal/dataobject/unitQuantity/UnitQuantityDO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo}/UntInfoDO.java (93%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation}/QuantityUnitRelationService.java (88%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation}/QuantityUnitRelationServiceImpl.java (89%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion}/UnitConversionHelperService.java (92%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion}/UnitConversionService.java (90%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion}/UnitConversionServiceImpl.java (95%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/service/unitQuantity/UnitQuantityService.java (82%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/service/unitQuantity/UnitQuantityServiceImpl.java (84%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo}/UntInfoService.java (81%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo}/UntInfoServiceImpl.java (83%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement => zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base}/util/UnitConversionUtil.java (97%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper => zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement}/QuantityUnitRelation/QuantityUnitRelationMapper.xml (100%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper => zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement}/UnitConversion/UnitConversionMapper.xml (100%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper => zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement}/unitQuantity/UnitQuantityMapper.xml (100%) rename {zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper => zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement}/untinfo/UntInfoMapper.xml (100%) delete mode 100644 zt-module-unit-management/pom.xml delete mode 100644 zt-module-unit-management/zt-module-unit-management-api/pom.xml delete mode 100644 zt-module-unit-management/zt-module-unit-management-server/pom.xml delete mode 100644 zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java diff --git a/base-server/pom.xml b/base-server/pom.xml index f82352d..b2c88ee 100644 --- a/base-server/pom.xml +++ b/base-server/pom.xml @@ -40,11 +40,6 @@ zt-module-erp-server ${revision} - - com.zt.plat - zt-module-unit-management-server - ${revision} - com.zt.plat diff --git a/pom.xml b/pom.xml index f912c36..e5a5726 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ zt-module-contract-order zt-module-erp base-server - zt-module-unit-management ${project.artifactId} diff --git a/zt-module-unit-management/zt-module-unit-management-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java similarity index 100% rename from zt-module-unit-management/zt-module-unit-management-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java index f6eef72..e526ea8 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/QuantityUnitRelationController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import com.zt.plat.module.unitmanagement.service.QuantityUnitRelation.QuantityUnitRelationService; +import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.service.quantityUnitRelation.QuantityUnitRelationService; @Tag(name = "管理后台 - 计量单位量与单位关联") @RestController diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java index 9dee92f..77a0260 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/CreateUnitWithRelationReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/CreateUnitWithRelationReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java similarity index 87% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java index 4d604e3..6a5c0f9 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/DeleteUnitWithRelationReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java index d308cfe..3dd7fbf 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationBatchSaveReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java similarity index 88% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java index 69c8aab..50c0542 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationPageReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import lombok.*; import java.util.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java index f79d47b..ae4b459 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java similarity index 90% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java index 8f40f60..ab411be 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/QuantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/vo/QuantityUnitRelationSaveReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo; +package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java similarity index 95% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java index 8f5415f..22ca105 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/UnitConversionController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion; +package com.zt.plat.module.base.controller.admin.unitConversion; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; -import com.zt.plat.module.unitmanagement.service.UnitConversion.UnitConversionService; +import com.zt.plat.module.base.controller.admin.unitConversion.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; +import com.zt.plat.module.base.service.unitConversion.UnitConversionService; @Tag(name = "管理后台 - 单位转换") @RestController diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java index 035d2f6..b88a07e 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertByNameReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertByNameReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java index a0075e6..5447982 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertBySymbolReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertBySymbolReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java similarity index 89% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java index 477951e..c786679 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java index 885df3d..8af4fc0 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/BatchUnitConvertRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/BatchUnitConvertRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java index 0763d9b..acbe0f7 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionPageReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import lombok.*; import java.util.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java index 7c59938..078069f 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java index 19fcaaf..0e470b1 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionSaveReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java similarity index 97% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java index e1c41d6..fc7b093 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConversionValidationRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConversionValidationRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java index ecf2959..4f1b0ff 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertByNameReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertByNameReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java index 933e68e..3bc792c 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertBySymbolReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertBySymbolReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java index 3793d1e..bd33987 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java index 47a8915..83c12f0 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/UnitConversion/vo/UnitConvertRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/vo/UnitConvertRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo; +package com.zt.plat.module.base.controller.admin.unitConversion.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java index f901754..8dcf203 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/UnitQuantityController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity; +package com.zt.plat.module.base.controller.admin.unitQuantity; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO; -import com.zt.plat.module.unitmanagement.service.UnitQuantity.UnitQuantityService; +import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO; +import com.zt.plat.module.base.service.unitQuantity.UnitQuantityService; @Tag(name = "管理后台 - 计量单位量") @RestController diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java similarity index 91% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java index 3ddd337..cca6088 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityPageReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo; +package com.zt.plat.module.base.controller.admin.unitQuantity.vo; import lombok.*; import java.util.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java index ad653e3..42e36b6 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo; +package com.zt.plat.module.base.controller.admin.unitQuantity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java index 086ef77..c673791 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantitySaveReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo; +package com.zt.plat.module.base.controller.admin.unitQuantity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java similarity index 95% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java index 3b1cc2e..bacbbc7 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/vo/UnitQuantityTreeRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo; +package com.zt.plat.module.base.controller.admin.unitQuantity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java index 6935276..3fca177 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/UntInfoController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UntInfo; +package com.zt.plat.module.base.controller.admin.untInfo; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -28,9 +27,9 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; -import com.zt.plat.module.unitmanagement.service.UntInfo.UntInfoService; +import com.zt.plat.module.base.controller.admin.untInfo.vo.*; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; +import com.zt.plat.module.base.service.untInfo.UntInfoService; @Tag(name = "管理后台 - 计量单位") @RestController diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java similarity index 91% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java index b2582c3..fb9ccbd 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoPageReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo; +package com.zt.plat.module.base.controller.admin.untInfo.vo; import lombok.*; import java.util.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java index 1ca397a..3c33bbf 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoRespVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo; +package com.zt.plat.module.base.controller.admin.untInfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java similarity index 91% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java index 32aabe3..cf86bfb 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/controller/admin/untinfo/vo/UntInfoSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/vo/UntInfoSaveReqVO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo; +package com.zt.plat.module.base.controller.admin.untInfo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java similarity index 82% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java index 60ca4a0..81eba42 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/QuantityUnitRelation/QuantityUnitRelationMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/quantityUnitRelation/QuantityUnitRelationMapper.java @@ -1,13 +1,13 @@ -package com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation; +package com.zt.plat.module.base.dal.dao.quantityUnitRelation; import java.util.*; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; import org.apache.ibatis.annotations.Mapper; -import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*; +import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*; /** * 计量单位量与单位关联 Mapper diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java similarity index 80% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java index 53a4bb7..4717e73 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/UnitConversion/UnitConversionMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitConversion/UnitConversionMapper.java @@ -1,13 +1,11 @@ -package com.zt.plat.module.unitmanagement.dal.dao.UnitConversion; - -import java.util.*; +package com.zt.plat.module.base.dal.dao.unitConversion; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; import org.apache.ibatis.annotations.Mapper; -import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*; +import com.zt.plat.module.base.controller.admin.unitConversion.vo.*; /** * 单位转换 Mapper diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java similarity index 78% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java index 56292e0..31ef092 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/unitQuantity/UnitQuantityMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/unitQuantity/UnitQuantityMapper.java @@ -1,13 +1,11 @@ -package com.zt.plat.module.unitmanagement.dal.dao.UnitQuantity; - -import java.util.*; +package com.zt.plat.module.base.dal.dao.unitQuantity; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO; +import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO; import org.apache.ibatis.annotations.Mapper; -import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*; +import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*; /** * 计量单位量 Mapper diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java similarity index 77% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java index 16640fb..b4c415f 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dao/untinfo/UntInfoMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/untInfo/UntInfoMapper.java @@ -1,13 +1,11 @@ -package com.zt.plat.module.unitmanagement.dal.dao.UntInfo; - -import java.util.*; +package com.zt.plat.module.base.dal.dao.untInfo; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; import org.apache.ibatis.annotations.Mapper; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*; +import com.zt.plat.module.base.controller.admin.untInfo.vo.*; /** * 计量单位 Mapper diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java index b8cf877..c4c6a1a 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/QuantityUnitRelation/QuantityUnitRelationDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/quantityUnitRelation/QuantityUnitRelationDO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation; +package com.zt.plat.module.base.dal.dataobject.quantityUnitRelation; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java similarity index 94% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java index 82679d4..520d80b 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/UnitConversion/UnitConversionDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitConversion/UnitConversionDO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion; +package com.zt.plat.module.base.dal.dataobject.unitConversion; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java index a2cd8e2..a1f4dff 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/unitQuantity/UnitQuantityDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/unitQuantity/UnitQuantityDO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity; +package com.zt.plat.module.base.dal.dataobject.unitQuantity; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java similarity index 93% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java index 1474f19..5d42a2a 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/dal/dataobject/untinfo/UntInfoDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/untInfo/UntInfoDO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo; +package com.zt.plat.module.base.dal.dataobject.untInfo; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; import lombok.*; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java similarity index 88% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java index 61e42e9..d4d0332 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationService.java @@ -1,11 +1,10 @@ -package com.zt.plat.module.unitmanagement.service.QuantityUnitRelation; +package com.zt.plat.module.base.service.quantityUnitRelation; import java.util.*; import jakarta.validation.*; -import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; /** * 计量单位量与单位关联 Service 接口 diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java similarity index 89% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java index 1a1be0d..824224d 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/QuantityUnitRelation/QuantityUnitRelationServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/quantityUnitRelation/QuantityUnitRelationServiceImpl.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.unitmanagement.service.QuantityUnitRelation; +package com.zt.plat.module.base.service.quantityUnitRelation; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; @@ -7,20 +7,18 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper; -import com.zt.plat.module.unitmanagement.service.UntInfo.UntInfoService; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.UntInfoSaveReqVO; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.UntInfoRespVO; +import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper; +import com.zt.plat.module.base.service.untInfo.UntInfoService; +import com.zt.plat.module.base.controller.admin.untInfo.vo.UntInfoSaveReqVO; +import com.zt.plat.module.base.controller.admin.untInfo.vo.UntInfoRespVO; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*; /** diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java similarity index 92% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java index 62b9da5..ec766d2 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionHelperService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionHelperService.java @@ -1,12 +1,12 @@ -package com.zt.plat.module.unitmanagement.service.UnitConversion; +package com.zt.plat.module.base.service.unitConversion; -import com.zt.plat.module.unitmanagement.dal.dao.UnitConversion.UnitConversionMapper; -import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper; -import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; -import com.zt.plat.module.unitmanagement.util.UnitConversionUtil; +import com.zt.plat.module.base.dal.dao.unitConversion.UnitConversionMapper; +import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper; +import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; +import com.zt.plat.module.base.util.UnitConversionUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java similarity index 90% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java index 67fdd2d..7c1d837 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionService.java @@ -1,11 +1,10 @@ -package com.zt.plat.module.unitmanagement.service.UnitConversion; +package com.zt.plat.module.base.service.unitConversion; import java.util.*; import jakarta.validation.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; +import com.zt.plat.module.base.controller.admin.unitConversion.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; /** * 单位转换 Service 接口 diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java similarity index 95% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java index 7507803..c0ba4e4 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/UnitConversion/UnitConversionServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitConversion/UnitConversionServiceImpl.java @@ -1,26 +1,24 @@ -package com.zt.plat.module.unitmanagement.service.UnitConversion; +package com.zt.plat.module.base.service.unitConversion; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitConversion.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; +import com.zt.plat.module.base.controller.admin.unitConversion.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.unitmanagement.dal.dao.UnitConversion.UnitConversionMapper; -import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper; -import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO; -import com.zt.plat.module.unitmanagement.service.UnitQuantity.UnitQuantityService; -import com.zt.plat.module.unitmanagement.util.UnitConversionUtil; +import com.zt.plat.module.base.dal.dao.unitConversion.UnitConversionMapper; +import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper; +import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; +import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO; +import com.zt.plat.module.base.service.unitQuantity.UnitQuantityService; +import com.zt.plat.module.base.util.UnitConversionUtil; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import lombok.extern.slf4j.Slf4j; @@ -29,7 +27,6 @@ import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*; /** diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java similarity index 82% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java index ef5c4ca..34ce202 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityService.java @@ -1,11 +1,10 @@ -package com.zt.plat.module.unitmanagement.service.UnitQuantity; +package com.zt.plat.module.base.service.unitQuantity; import java.util.*; import jakarta.validation.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO; +import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; /** * 计量单位量 Service 接口 diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java similarity index 84% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java index 5a482c3..c8566cc 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/unitQuantity/UnitQuantityServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/unitQuantity/UnitQuantityServiceImpl.java @@ -1,28 +1,25 @@ -package com.zt.plat.module.unitmanagement.service.UnitQuantity; +package com.zt.plat.module.base.service.unitQuantity; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; -import com.zt.plat.module.unitmanagement.controller.admin.UnitQuantity.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitQuantity.UnitQuantityDO; +import com.zt.plat.module.base.controller.admin.unitQuantity.vo.*; +import com.zt.plat.module.base.dal.dataobject.unitQuantity.UnitQuantityDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.unitmanagement.dal.dao.UnitQuantity.UnitQuantityMapper; -import com.zt.plat.module.unitmanagement.dal.dao.QuantityUnitRelation.QuantityUnitRelationMapper; -import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; +import com.zt.plat.module.base.dal.dao.unitQuantity.UnitQuantityMapper; +import com.zt.plat.module.base.dal.dao.quantityUnitRelation.QuantityUnitRelationMapper; +import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*; /** diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java similarity index 81% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java index 37a8967..2bd0a88 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoService.java @@ -1,11 +1,10 @@ -package com.zt.plat.module.unitmanagement.service.UntInfo; +package com.zt.plat.module.base.service.untInfo; import java.util.*; import jakarta.validation.*; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; +import com.zt.plat.module.base.controller.admin.untInfo.vo.*; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; /** * 计量单位 Service 接口 diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java similarity index 83% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java index ea38763..0516cca 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/service/untinfo/UntInfoServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/untInfo/UntInfoServiceImpl.java @@ -1,23 +1,20 @@ -package com.zt.plat.module.unitmanagement.service.UntInfo; +package com.zt.plat.module.base.service.untInfo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; import java.util.*; -import com.zt.plat.module.unitmanagement.controller.admin.UntInfo.vo.*; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; +import com.zt.plat.module.base.controller.admin.untInfo.vo.*; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.unitmanagement.dal.dao.UntInfo.UntInfoMapper; +import com.zt.plat.module.base.dal.dao.untInfo.UntInfoMapper; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.unitmanagement.enums.UnitErrorCodeConstants.*; /** diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java similarity index 97% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java rename to zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java index 23f0643..2298332 100644 --- a/zt-module-unit-management/zt-module-unit-management-server/src/main/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtil.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/UnitConversionUtil.java @@ -1,14 +1,13 @@ -package com.zt.plat.module.unitmanagement.util; +package com.zt.plat.module.base.util; -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.UntInfo.UntInfoDO; +import com.zt.plat.module.base.dal.dataobject.unitConversion.UnitConversionDO; +import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO; +import com.zt.plat.module.base.dal.dataobject.untInfo.UntInfoDO; import lombok.extern.slf4j.Slf4j; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/QuantityUnitRelation/QuantityUnitRelationMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/QuantityUnitRelation/QuantityUnitRelationMapper.xml similarity index 100% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/QuantityUnitRelation/QuantityUnitRelationMapper.xml rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/QuantityUnitRelation/QuantityUnitRelationMapper.xml diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/UnitConversion/UnitConversionMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/UnitConversion/UnitConversionMapper.xml similarity index 100% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/UnitConversion/UnitConversionMapper.xml rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/UnitConversion/UnitConversionMapper.xml diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/unitQuantity/UnitQuantityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/unitQuantity/UnitQuantityMapper.xml similarity index 100% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/unitQuantity/UnitQuantityMapper.xml rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/unitQuantity/UnitQuantityMapper.xml diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/untinfo/UntInfoMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/untinfo/UntInfoMapper.xml similarity index 100% rename from zt-module-unit-management/zt-module-unit-management-server/src/main/resources/mapper/untinfo/UntInfoMapper.xml rename to zt-module-base/zt-module-base-server/src/main/resources/mapper/unitmanagement/untinfo/UntInfoMapper.xml diff --git a/zt-module-unit-management/pom.xml b/zt-module-unit-management/pom.xml deleted file mode 100644 index d23f6df..0000000 --- a/zt-module-unit-management/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - dsc-base - com.zt.plat - ${revision} - - - zt-module-unit-management-api - zt-module-unit-management-server - - 4.0.0 - - zt-module-unit-management - pom - - ${project.artifactId} - - 计量单位 模块。 - - - diff --git a/zt-module-unit-management/zt-module-unit-management-api/pom.xml b/zt-module-unit-management/zt-module-unit-management-api/pom.xml deleted file mode 100644 index a3915ed..0000000 --- a/zt-module-unit-management/zt-module-unit-management-api/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - zt-module-unit-management - com.zt.plat - ${revision} - - 4.0.0 - zt-module-unit-management-api - jar - - ${project.artifactId} - - 暴露给其它模块调用 - - - - - com.zt.plat - zt-common - - - - org.springdoc - springdoc-openapi-starter-webmvc-api - provided - - - - - org.springframework.boot - spring-boot-starter-validation - true - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - true - - - - diff --git a/zt-module-unit-management/zt-module-unit-management-server/pom.xml b/zt-module-unit-management/zt-module-unit-management-server/pom.xml deleted file mode 100644 index d746339..0000000 --- a/zt-module-unit-management/zt-module-unit-management-server/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - zt-module-unit-management - com.zt.plat - ${revision} - - 4.0.0 - jar - - zt-module-unit-management-server - - ${project.artifactId} - - 计量单位管理 模块。 - - - - - - com.zt.plat - zt-spring-boot-starter-env - - - - - com.zt.plat - zt-module-system-api - ${revision} - - - com.zt.plat - zt-module-infra-api - ${revision} - - - - com.zt.plat - zt-module-unit-management-api - ${revision} - - - - - com.zt.plat - zt-spring-boot-starter-biz-data-permission - - - com.zt.plat - zt-spring-boot-starter-biz-tenant - - - - - com.zt.plat - zt-spring-boot-starter-web - - - - com.zt.plat - zt-spring-boot-starter-security - - - - - com.zt.plat - zt-spring-boot-starter-mybatis - - - - com.zt.plat - zt-spring-boot-starter-redis - - - - - com.zt.plat - zt-spring-boot-starter-rpc - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.zt.plat - zt-spring-boot-starter-job - - - - - com.zt.plat - zt-spring-boot-starter-mq - - - - - com.zt.plat - zt-spring-boot-starter-test - - - - - com.zt.plat - zt-spring-boot-starter-excel - - - - - com.zt.plat - zt-spring-boot-starter-monitor - - - com.zt.plat - zt-spring-boot-starter-biz-business - ${revision} - - - - - - ${project.artifactId} - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java b/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java deleted file mode 100644 index 732f50a..0000000 --- a/zt-module-unit-management/zt-module-unit-management-server/src/test/java/com/zt/plat/module/unitmanagement/util/UnitConversionUtilTest.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.zt.plat.module.unitmanagement.util; - -import com.zt.plat.module.unitmanagement.dal.dataobject.UnitConversion.UnitConversionDO; -import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.DisplayName; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * UnitConversionUtil 工具类测试 - * - * 测试内容： - * 1. 相同单位转换 - * 2. 直接转换策略 - * 3. 基准单位转换策略 - * 4. 精度控制 - * 5. 批量转换 - * 6. 错误场景 - */ -class UnitConversionUtilTest { - - /** - * 准备测试数据 - */ - private TestData prepareTestData() { - TestData data = new TestData(); - - // 量纲ID - Long lengthQuantityId = 1L; - Long weightQuantityId = 2L; - - // 单位ID - Long meterId = 101L; // 米（基准） - Long kilometerId = 102L; // 千米 - Long centimeterId = 103L; // 厘米 - Long millimeterId = 104L; // 毫米 - Long kilogramId = 201L; // 千克（基准） - Long tonId = 202L; // 吨 - - // 构建量纲-单位关联关系 - data.relations = new ArrayList<>(); - data.relations.add(createRelation(1L, lengthQuantityId, meterId, 1)); // 米是基准 - data.relations.add(createRelation(2L, lengthQuantityId, kilometerId, 0)); - data.relations.add(createRelation(3L, lengthQuantityId, centimeterId, 0)); - data.relations.add(createRelation(4L, lengthQuantityId, millimeterId, 0)); - data.relations.add(createRelation(5L, weightQuantityId, kilogramId, 1)); // 千克是基准 - data.relations.add(createRelation(6L, weightQuantityId, tonId, 0)); - - // 构建转换规则（只配置到基准单位的转换） - data.conversions = new ArrayList<>(); - - // 千米 <-> 米 - data.conversions.add(createConversion(1L, kilometerId, meterId, new BigDecimal("1000"), "1km = 1000m")); - data.conversions.add(createConversion(2L, meterId, kilometerId, new BigDecimal("0.001"), "1m = 0.001km")); - - // 厘米 <-> 米 - data.conversions.add(createConversion(3L, centimeterId, meterId, new BigDecimal("0.01"), "1cm = 0.01m")); - data.conversions.add(createConversion(4L, meterId, centimeterId, new BigDecimal("100"), "1m = 100cm")); - - // 毫米 <-> 米 - data.conversions.add(createConversion(5L, millimeterId, meterId, new BigDecimal("0.001"), "1mm = 0.001m")); - data.conversions.add(createConversion(6L, meterId, millimeterId, new BigDecimal("1000"), "1m = 1000mm")); - - // 吨 <-> 千克 - data.conversions.add(createConversion(7L, tonId, kilogramId, new BigDecimal("1000"), "1t = 1000kg")); - data.conversions.add(createConversion(8L, kilogramId, tonId, new BigDecimal("0.001"), "1kg = 0.001t")); - - // 保存单位ID供测试使用 - data.meterId = meterId; - data.kilometerId = kilometerId; - data.centimeterId = centimeterId; - data.millimeterId = millimeterId; - data.kilogramId = kilogramId; - data.tonId = tonId; - - return data; - } - - private QuantityUnitRelationDO createRelation(Long id, Long quantityId, Long unitId, Integer isBase) { - QuantityUnitRelationDO relation = new QuantityUnitRelationDO(); - relation.setId(id); - relation.setUntQtyId(quantityId); - relation.setUntId(unitId); - relation.setIsBse(isBase); - return relation; - } - - private UnitConversionDO createConversion(Long id, Long srcId, Long tgtId, BigDecimal factor, String formula) { - UnitConversionDO conversion = new UnitConversionDO(); - conversion.setId(id); - conversion.setSrcUntId(srcId); - conversion.setTgtUntId(tgtId); - conversion.setFctr(factor); - conversion.setFmu(formula); - return conversion; - } - - @Test - @DisplayName("测试1: 相同单位转换") - void testSameUnitConversion() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("100"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.meterId, data.meterId, - data.conversions, data.relations, 6 - ); - - assertEquals(value, result.getValue(), "相同单位转换，值应该不变"); - assertEquals(BigDecimal.ONE, result.getFactor(), "相同单位转换，因子应该为1"); - assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "相同单位应使用DIRECT策略"); - } - - @Test - @DisplayName("测试2: 直接转换策略 - 千米到米") - void testDirectConversion_KmToM() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("5.5"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.kilometerId, data.meterId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("5500.000000"), result.getValue(), "5.5km应该等于5500m"); - assertEquals(new BigDecimal("1000"), result.getFactor(), "千米到米的因子应该是1000"); - assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "应使用DIRECT策略"); - } - - @Test - @DisplayName("测试3: 直接转换策略 - 米到千米") - void testDirectConversion_MToKm() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("5000"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.meterId, data.kilometerId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("5.000000"), result.getValue(), "5000m应该等于5km"); - assertEquals(new BigDecimal("0.001"), result.getFactor(), "米到千米的因子应该是0.001"); - assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy(), "应使用DIRECT策略"); - } - - @Test - @DisplayName("测试4: 基准单位转换策略 - 厘米到千米") - void testViaBaseUnitConversion_CmToKm() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("100000"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.centimeterId, data.kilometerId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("1.000000"), result.getValue(), "100000cm应该等于1km"); - assertEquals(UnitConversionUtil.ConversionStrategy.VIA_BASE_UNIT, result.getStrategy(), - "厘米到千米应使用VIA_BASE_UNIT策略"); - assertTrue(result.getFormula().contains("基准单位"), "公式应该提到基准单位"); - } - - @Test - @DisplayName("测试5: 基准单位转换策略 - 毫米到千米") - void testViaBaseUnitConversion_MmToKm() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("1000000"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.millimeterId, data.kilometerId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("1.000000"), result.getValue(), "1000000mm应该等于1km"); - assertEquals(UnitConversionUtil.ConversionStrategy.VIA_BASE_UNIT, result.getStrategy(), - "毫米到千米应使用VIA_BASE_UNIT策略"); - } - - @Test - @DisplayName("测试6: 精度控制 - 2位小数") - void testPrecisionControl_2Digits() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("1.23456789"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.kilometerId, data.meterId, - data.conversions, data.relations, 2 - ); - - assertEquals(new BigDecimal("1234.57"), result.getValue(), "精度应该控制在2位小数"); - } - - @Test - @DisplayName("测试7: 精度控制 - 6位小数") - void testPrecisionControl_6Digits() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("1.23456789"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.kilometerId, data.meterId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("1234.567890"), result.getValue(), "精度应该控制在6位小数"); - } - - @Test - @DisplayName("测试8: 批量转换") - void testBatchConversion() { - TestData data = prepareTestData(); - - List values = new ArrayList<>(); - values.add(new BigDecimal("1")); - values.add(new BigDecimal("2")); - values.add(new BigDecimal("3")); - - List results = UnitConversionUtil.batchConvert( - values, data.kilometerId, data.meterId, - data.conversions, data.relations, 6 - ); - - assertEquals(3, results.size(), "应该返回3个转换结果"); - assertEquals(new BigDecimal("1000.000000"), results.get(0).getValue(), "1km = 1000m"); - assertEquals(new BigDecimal("2000.000000"), results.get(1).getValue(), "2km = 2000m"); - assertEquals(new BigDecimal("3000.000000"), results.get(2).getValue(), "3km = 3000m"); - } - - - - @Test - @DisplayName("测试10: 重量单位转换 - 千克到吨") - void testWeightConversion_KgToTon() { - TestData data = prepareTestData(); - - BigDecimal value = new BigDecimal("1000"); - UnitConversionUtil.ConversionResult result = UnitConversionUtil.convert( - value, data.kilogramId, data.tonId, - data.conversions, data.relations, 6 - ); - - assertEquals(new BigDecimal("1.000000"), result.getValue(), "1000kg应该等于1t"); - assertEquals(new BigDecimal("0.001"), result.getFactor(), "千克到吨的因子应该是0.001"); - assertEquals(UnitConversionUtil.ConversionStrategy.DIRECT, result.getStrategy()); - } - - /** - * 测试数据容器 - */ - static class TestData { - List conversions; - List relations; - Long meterId; - Long kilometerId; - Long centimeterId; - Long millimeterId; - Long kilogramId; - Long tonId; - } -}