From 7193bfe7c5774e509c3166e463ff8bd2c301f1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Thu, 8 Aug 2024 19:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E4=BD=BF=E7=94=A8gr?= =?UTF-8?q?oups=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/common/core/domain/Result.java | 2 ++ .../java/com/muyu/common/core/text/Convert.java | 9 ++++++++- .../core/validation/custom/IsSystemPayType.java | 16 +++++++++++----- .../core/validation/custom/IsSystemYesNo.java | 8 +++++--- .../custom/SystemPayTypeValidator.java | 8 ++++---- .../validation/custom/SystemYesNoValidator.java | 7 +++---- .../muyu/common/core/web/domain/BaseEntity.java | 5 +++++ 7 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/muyu/common/core/domain/Result.java b/src/main/java/com/muyu/common/core/domain/Result.java index 70faa40..d8cb95c 100644 --- a/src/main/java/com/muyu/common/core/domain/Result.java +++ b/src/main/java/com/muyu/common/core/domain/Result.java @@ -2,6 +2,7 @@ package com.muyu.common.core.domain; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.HttpStatus; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,6 +19,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor +@Tag(name = "公共返回值" , description = "系统公共返回值，统一返回格式内容") public class Result implements Serializable { /** * 成功 diff --git a/src/main/java/com/muyu/common/core/text/Convert.java b/src/main/java/com/muyu/common/core/text/Convert.java index fb57cb9..3a59f63 100644 --- a/src/main/java/com/muyu/common/core/text/Convert.java +++ b/src/main/java/com/muyu/common/core/text/Convert.java @@ -1,6 +1,7 @@ package com.muyu.common.core.text; import com.muyu.common.core.utils.StringUtils; +import lombok.extern.log4j.Log4j2; import java.math.BigDecimal; import java.math.BigInteger; @@ -15,6 +16,7 @@ import java.util.Set; * * @author muyu */ +@Log4j2 public class Convert { /** * 转换为字符串
@@ -687,7 +689,12 @@ public class Convert { * @return 字符串 */ public static String str (Object obj, String charsetName) { - return str(obj, Charset.forName(charsetName)); + try { + return str(obj, Charset.forName(charsetName)); + }catch (Exception exception){ + log.error("字符转换异常：[{}-{}] -> {}", obj, charsetName, exception.getMessage(), exception); + throw new RuntimeException(exception); + } } /** diff --git a/src/main/java/com/muyu/common/core/validation/custom/IsSystemPayType.java b/src/main/java/com/muyu/common/core/validation/custom/IsSystemPayType.java index abf5604..2d5c429 100644 --- a/src/main/java/com/muyu/common/core/validation/custom/IsSystemPayType.java +++ b/src/main/java/com/muyu/common/core/validation/custom/IsSystemPayType.java @@ -3,15 +3,21 @@ package com.muyu.common.core.validation.custom; import jakarta.validation.Constraint; import jakarta.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + @Target({ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) +@Retention(RUNTIME) @Documented @Constraint(validatedBy = {SystemPayTypeValidator.class}) public @interface IsSystemPayType { - String message() default "支付渠道参数不合法"; - Class[] groups() default { }; - Class[] payload() default { }; + String message () default "[支付渠道] - 参数不合法"; + Class[] groups () default { }; + Class[] payload () default { }; } diff --git a/src/main/java/com/muyu/common/core/validation/custom/IsSystemYesNo.java b/src/main/java/com/muyu/common/core/validation/custom/IsSystemYesNo.java index bbc2a2d..08b2014 100644 --- a/src/main/java/com/muyu/common/core/validation/custom/IsSystemYesNo.java +++ b/src/main/java/com/muyu/common/core/validation/custom/IsSystemYesNo.java @@ -3,17 +3,19 @@ package com.muyu.common.core.validation.custom; import jakarta.validation.Constraint; import jakarta.validation.Payload; - -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import static java.lang.annotation.RetentionPolicy.RUNTIME; + @Target({ElementType.FIELD}) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {SystemYesNoValidator.class}) public @interface IsSystemYesNo { - String message() default "数据字典：[系统是否] - 参数不合法"; Class[] groups() default { }; Class[] payload() default { }; diff --git a/src/main/java/com/muyu/common/core/validation/custom/SystemPayTypeValidator.java b/src/main/java/com/muyu/common/core/validation/custom/SystemPayTypeValidator.java index bbcdf16..7e992c9 100644 --- a/src/main/java/com/muyu/common/core/validation/custom/SystemPayTypeValidator.java +++ b/src/main/java/com/muyu/common/core/validation/custom/SystemPayTypeValidator.java @@ -4,10 +4,10 @@ import com.muyu.common.core.enums.SysPayType; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -public class SystemPayTypeValidator implements ConstraintValidator { - @Override - public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { - return SysPayType.isCode(s); +public class SystemPayTypeValidator implements ConstraintValidator { + @Override + public boolean isValid (String value, ConstraintValidatorContext constraintValidatorContext) { + return SysPayType.isCode(value); } } diff --git a/src/main/java/com/muyu/common/core/validation/custom/SystemYesNoValidator.java b/src/main/java/com/muyu/common/core/validation/custom/SystemYesNoValidator.java index f57fea1..a805ca9 100644 --- a/src/main/java/com/muyu/common/core/validation/custom/SystemYesNoValidator.java +++ b/src/main/java/com/muyu/common/core/validation/custom/SystemYesNoValidator.java @@ -4,10 +4,9 @@ import com.muyu.common.core.enums.SystemYesNo; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -public class SystemYesNoValidator implements ConstraintValidator { +public class SystemYesNoValidator implements ConstraintValidator { @Override - public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { - return SystemYesNo.isCode(s); - + public boolean isValid (String value, ConstraintValidatorContext constraintValidatorContext) { + return SystemYesNo.isCode(value); } } diff --git a/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index add8e3e..d9f8ef3 100644 --- a/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java @@ -1,5 +1,6 @@ package com.muyu.common.core.web.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -36,23 +37,27 @@ public class BaseEntity implements Serializable { /** * 创建者 */ + @TableField(fill = FieldFill.INSERT) private String createBy; /** * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 更新者 */ + @TableField(fill = FieldFill.UPDATE) private String updateBy; /** * 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.UPDATE) private Date updateTime; /**