From 70b94ee18edd1ba4990086043308d99e52421422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BA=9A=E6=96=8C?= <898369080@qq.com> Date: Thu, 10 Oct 2024 20:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20=20#1?= =?UTF-8?q?=EF=BC=9AJDK17=E4=B8=AD=EF=BC=8Cjavax.validation.constraints?= =?UTF-8?q?=E5=86=85=E7=9A=84=E6=B3=A8=E8=A7=A3=EF=BC=88@NotNull=E7=AD=89?= =?UTF-8?q?=EF=BC=89=E5=B7=B2=E8=BD=AC=E7=A7=BB=E5=88=B0jakarta.validation?= =?UTF-8?q?.constraints=E5=8C=85=E4=B8=AD=EF=BC=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E7=9A=84=E5=AF=BC=E5=8C=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E4=BC=9A=E5=AF=BC=E8=87=B4=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=BE=E4=B8=8D=E5=88=B0=E5=8C=85=E3=80=82?= =?UTF-8?q?=20#2:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=9C=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E5=88=97=E8=A1=A8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=AD=97=E5=85=B8=E9=80=89=E9=A1=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=BA=86=E5=B7=B2=E7=BB=8F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E6=98=AF=E7=94=A8=E4=BA=86MP=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../variable/backend/domain/AddFormVariableService.java | 4 ++-- .../variable/backend/domain/UpdateFormVariableService.java | 2 +- .../sa/base/module/support/dict/service/DictService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java index 6bde65d4..87a51d29 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java @@ -96,8 +96,8 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService { if (Boolean.TRUE.equals(field.getRequiredFlag())) { String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull"; finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")"); - packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;" - : "import javax.validation.constraints.NotNull;"); + packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;" + : "import jakarta.validation.constraints.NotNull;"); } } diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java index 004e7670..a3cfb439 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java @@ -111,7 +111,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService { if (Boolean.TRUE.equals(field.getRequiredFlag())) { String notEmptyPrefix = "String".equals(codeField.getJavaType()) ? "@NotBlank" : "@NotNull"; finalFieldMap.put("notEmpty", "\n " + notEmptyPrefix + "(message = \"" + codeField.getLabel() + " 不能为空\")"); - packageList.add("String".equals(codeField.getJavaType()) ? "import javax.validation.constraints.NotBlank;" : "import javax.validation.constraints.NotNull;"); + packageList.add("String".equals(codeField.getJavaType()) ? "import jakarta.validation.constraints.NotBlank;" : "import jakarta.validation.constraints.NotNull;"); } } diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java index 122f2a75..9fba4d06 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java @@ -172,7 +172,7 @@ public class DictService { * @return */ public List queryAllKey() { - return SmartBeanUtil.copyList(dictKeyDao.selectList(null), DictKeyVO.class); + return SmartBeanUtil.copyList(dictKeyDao.selectByDeletedFlag(false), DictKeyVO.class); } /**