From 56db7982b02da9b179181d3de57a108e8b6e8267 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Mon, 8 Jan 2024 13:57:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4=20javax=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/module/heli/ErrorCodeConstants.java | 11 ---------- .../module/heli/enums/ErrorCodeConstants.java | 22 +++++++++++++++++++ .../codegen/java/controller/controller.vm | 10 ++++----- .../codegen/java/controller/vo/saveReqVO.vm | 4 ++-- .../resources/codegen/java/service/service.vm | 4 ++-- .../codegen/java/service/serviceImpl.vm | 4 ++-- .../codegen/java/test/serviceTest.vm | 6 ++--- 7 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/ErrorCodeConstants.java create mode 100644 mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/ErrorCodeConstants.java deleted file mode 100644 index 0e7711da..00000000 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/ErrorCodeConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.chanko.yunxi.mes.module.heli; - -/** - * 业务错误码枚举类 - * - * 系统，使用 1-003-000-000 段 - */ -public interface ErrorCodeConstants { - - -} diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java new file mode 100644 index 00000000..4ec95814 --- /dev/null +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -0,0 +1,22 @@ +package com.chanko.yunxi.mes.module.heli.enums; + +import com.chanko.yunxi.mes.framework.common.exception.ErrorCode; + +/** + * 业务错误码枚举类 + * 1_001_001 + * + * 一共 7 位，分成三段 + * 第一段，1 位，异常类型 + * 1 - 业务级别异常 + * x - 预留 + * 第二段，3 位，模块 + * 001 基础信息 + * 第三段，3 位，错误码 + */ +public interface ErrorCodeConstants { + /*基础信息*/ + ErrorCode MATERIAL_NOT_EXISTS = new ErrorCode(1_001_001, "物料不存在"); + ErrorCode COMPOSITION_NOT_EXISTS = new ErrorCode(1_001_002, "材质不存在"); + +} diff --git a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm index f58ce0cb..1e6b658b 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm +++ b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm @@ -1,7 +1,7 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; #if ($sceneEnum.scene == 1)import org.springframework.security.access.prepost.PreAuthorize;#end @@ -9,9 +9,9 @@ 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 javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; import java.util.*; import java.io.IOException; @@ -230,4 +230,4 @@ public class ${sceneEnum.prefixClass}${table.className}Controller { #end #end -} \ No newline at end of file +} diff --git a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm index 5e03326c..48d6491e 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm +++ b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm @@ -3,7 +3,7 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import jakarta.validation.constraints.*; +import javax.validation.constraints.*; ## 处理 BigDecimal 字段的引入 import java.util.*; #foreach ($column in $columns) @@ -62,4 +62,4 @@ public class ${sceneEnum.prefixClass}${table.className}SaveReqVO { #end #end #end -} \ No newline at end of file +} diff --git a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/service.vm b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/service.vm index 828cabdf..7cf4150f 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/service.vm +++ b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/service.vm @@ -1,7 +1,7 @@ package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; import java.util.*; -import jakarta.validation.*; +import javax.validation.*; import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; ## 特殊：主子表专属逻辑 @@ -144,4 +144,4 @@ public interface ${table.className}Service { #end #end -} \ No newline at end of file +} diff --git a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm index 4d707092..66143d24 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm +++ b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm @@ -1,7 +1,7 @@ package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; @@ -347,4 +347,4 @@ public class ${table.className}ServiceImpl implements ${table.className}Service } #end -} \ No newline at end of file +} diff --git a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm index f7294506..3f3f2dd7 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm +++ b/mes-module-infra/mes-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import ${baseFrameworkPackage}.test.core.ut.BaseDbUnitTest; @@ -13,7 +13,7 @@ import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.business import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName}.${table.className}Mapper; import ${PageResultClassName}; -import jakarta.annotation.Resource; +import javax.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; @@ -165,4 +165,4 @@ public class ${table.className}ServiceImplTest extends BaseDbUnitTest { } #end -} \ No newline at end of file +}