diff --git a/src/main/java/com/bruce/common/config/AttachmentProperties.java b/src/main/java/com/bruce/common/config/AttachmentProperties.java index cb2caf1..18ca7f8 100644 --- a/src/main/java/com/bruce/common/config/AttachmentProperties.java +++ b/src/main/java/com/bruce/common/config/AttachmentProperties.java @@ -1,5 +1,6 @@ package com.bruce.common.config; +import com.bruce.common.constant.CommonConsts; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -11,6 +12,6 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "common.attachment") public class AttachmentProperties { - private String basePath = "data/attachments"; + private String basePath = CommonConsts.DEFAULT_ATTACHMENT_BASE_PATH; } diff --git a/src/main/java/com/bruce/common/constant/CommonConsts.java b/src/main/java/com/bruce/common/constant/CommonConsts.java new file mode 100644 index 0000000..9a5df07 --- /dev/null +++ b/src/main/java/com/bruce/common/constant/CommonConsts.java @@ -0,0 +1,21 @@ +package com.bruce.common.constant; + +public final class CommonConsts { + + public static final String DATE_FORMAT_LONG_STR = "yyyy-MM-dd HH:mm:ss"; + + public static final String DATE_FORMAT_MILLIS_STR = "yyyy-MM-dd HH:mm:ss.SSS"; + + public static final String TIME_ZONE_GMT8 = "GMT+8"; + + public static final String DEFAULT_ATTACHMENT_BASE_PATH = "data/attachments"; + + public static final String STORAGE_TYPE_LOCAL = "LOCAL"; + + public static final String REQUEST_RESULT_SUCCESS_CODE = "0"; + + public static final String REQUEST_RESULT_FAIL_CODE = "-1"; + + private CommonConsts() { + } +} diff --git a/src/main/java/com/bruce/common/domain/model/BaseEntity.java b/src/main/java/com/bruce/common/domain/model/BaseEntity.java index a1b03ad..9c79bfe 100644 --- a/src/main/java/com/bruce/common/domain/model/BaseEntity.java +++ b/src/main/java/com/bruce/common/domain/model/BaseEntity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; +import com.bruce.common.constant.CommonConsts; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -24,7 +25,7 @@ public class BaseEntity { private String createBy; @Schema(description = "创建时间", example = "2026-05-18 20:00:00") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = CommonConsts.DATE_FORMAT_LONG_STR, timezone = CommonConsts.TIME_ZONE_GMT8) @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; @@ -33,7 +34,7 @@ public class BaseEntity { private String updateBy; @Schema(description = "更新时间", example = "2026-05-18 20:00:00") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = CommonConsts.DATE_FORMAT_LONG_STR, timezone = CommonConsts.TIME_ZONE_GMT8) @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private Date updateTime; diff --git a/src/main/java/com/bruce/common/domain/model/RequestResult.java b/src/main/java/com/bruce/common/domain/model/RequestResult.java index d829176..cd50f26 100644 --- a/src/main/java/com/bruce/common/domain/model/RequestResult.java +++ b/src/main/java/com/bruce/common/domain/model/RequestResult.java @@ -1,5 +1,6 @@ package com.bruce.common.domain.model; +import com.bruce.common.constant.CommonConsts; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,9 +11,9 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class RequestResult { - public static final String FAIL_CODE = "-1"; + public static final String FAIL_CODE = CommonConsts.REQUEST_RESULT_FAIL_CODE; - public static final String SUCCESS_CODE = "0"; + public static final String SUCCESS_CODE = CommonConsts.REQUEST_RESULT_SUCCESS_CODE; @Schema(description = "错误消息") private String message; diff --git a/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java b/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java index 605a17b..407bc6f 100644 --- a/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java +++ b/src/main/java/com/bruce/common/service/impl/SysAttachmentServiceImpl.java @@ -2,6 +2,7 @@ package com.bruce.common.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bruce.common.config.AttachmentProperties; +import com.bruce.common.constant.CommonConsts; import com.bruce.common.domain.entity.SysAttachment; import com.bruce.common.dto.request.SysAttachmentUploadRequest; import com.bruce.common.mapper.SysAttachmentMapper; @@ -22,8 +23,6 @@ import java.util.UUID; @Service public class SysAttachmentServiceImpl extends ServiceImpl implements ISysAttachmentService { - private static final String STORAGE_TYPE_LOCAL = "LOCAL"; - @Autowired private AttachmentProperties attachmentProperties; @@ -64,7 +63,7 @@ public class SysAttachmentServiceImpl extends ServiceImpl service.validateSaveRequest(request)); } + + @Test + void saveShouldDefaultStatusToEnabledEnumLabel() { + RagStoreServiceImpl service = new RagStoreServiceImpl(); + RagStoreSaveRequest request = new RagStoreSaveRequest(); + request.setStoreCode("PROD_DOC"); + request.setStoreName("产品制度库"); + + RagStore ragStore = service.buildEntity(request); + + assertEquals(EnableStatusEnum.ENABLED.getLabel(), ragStore.getStatus()); + } }