From e7c9817ea941cbba5391bd2f9155c1bbb71ff53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 18:45:58 +0800
Subject: [PATCH] 权限
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
index bd5ad08..94db5c6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
@@ -1,48 +1,107 @@
package com.ruoyi.common.core.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.data.annotation.CreatedBy;
import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
- * Entity基类
- *
- * @author ruoyi
+ * @author xiaochen
+ * @ClassName BaseModel
+ * @Description
+ * @date 2024-04-02 19:38
*/
@Data
-public class BaseModel implements Serializable
-{
- private static final long serialVersionUID = 1L;
+public class BaseModel implements Serializable {
+ /**
+ * 字段常量属性
+ */
+ public static final String ID = "id";
- /** 创建者 */
+ public static final String CREATE_TIME = "create_time";
+
+ public static final String LAST_TIME = "last_time";
+
+ private static final long serialVersionUID = 2553749188490103197L;
+ /**
+ * 新增执行
+ */
@ApiModelProperty(value = "记录创建人，前端忽略")
- @CreatedBy
+ @JsonIgnore
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
- /** 创建时间 */
- @ApiModelProperty(value = "记录创建时间，前端忽略")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /** 更新者 */
-
+ /**
+ * 新增和更新执行
+ */
@ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
-
- /** 更新时间 */
- @ApiModelProperty(value = "记录修改时间，前端忽略")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 是否删除 0未删除 1已删除 */
- @ApiModelProperty(value = "是否删除 0未删除 1已删除")
+ /**
+ * 删除 未删除
+ */
+ @JsonIgnore
+ @TableField("`disabled`")
@TableLogic
- private Integer isDelete;
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 最后修改时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Boolean getDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(Boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public LocalDateTime getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(LocalDateTime createTime) {
+ this.createTime = createTime;
+ }
+
+ public LocalDateTime getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(LocalDateTime updateTime) {
+ this.updateTime = updateTime;
+ }
}
--
Gitblit v1.7.1