From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java |   65 +++++++++++---------------------
 1 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 5be7630..0ff548f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -1,20 +1,19 @@
 package com.vincent.rsf.server.system.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.system.service.DictDataService;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -94,7 +93,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -114,6 +112,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -127,13 +126,27 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
+
+    @Version
+    private Integer sVersion;
 
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+    @TableField(exist = false)
+    private String reset$;
+
+    @TableField(exist = false)
+    private String createBy$;
+
+    @TableField(exist = false)
+    private String updateBy$;
+
+
 
     public SerialRule() {}
 
@@ -155,33 +168,8 @@
         this.memo = memo;
     }
 
-//    SerialRule serialRule = new SerialRule(
-//            null,    // 缂栧彿
-//            null,    // 鍚嶇О
-//            null,    // 鍒嗛殧绗�
-//            null,    // 搴忓彿閲嶇疆瑙勫垯[闈炵┖]
-//            null,    // 閲嶇疆渚濊禆
-//            null,    // 褰撳墠鍊�
-//            null,    // 鏈�杩戠敓鎴愮紪鐮�
-//            null,    // 鐘舵�乕闈炵┖]
-//            null,    // 鏄惁鍒犻櫎[闈炵┖]
-//            null,    // 绉熸埛
-//            null,    // 娣诲姞浜哄憳
-//            null,    // 娣诲姞鏃堕棿[闈炵┖]
-//            null,    // 淇敼浜哄憳
-//            null,    // 淇敼鏃堕棿[闈炵┖]
-//            null    // 澶囨敞
-//    );
-
     public String getReset$(){
-        if (null == this.reset){ return null; }
-        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
-        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictTypeCode,"sys_rule_type").eq(DictData::getValue, this.reset));
-        if (null != dictData){
-            return dictData.getLabel();
-        }
-        return String.valueOf(this.reset);
+        return this.reset$;
     }
 
     public String getStatus$(){
@@ -197,12 +185,7 @@
     }
 
     public String getCreateBy$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.createBy);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getNickname());
-        }
-        return null;
+        return this.createBy$;
     }
 
     public String getCreateTime$(){
@@ -213,12 +196,7 @@
     }
 
     public String getUpdateBy$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.updateBy);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getNickname());
-        }
-        return null;
+        return this.updateBy$;
     }
 
     public String getUpdateTime$(){
@@ -243,3 +221,4 @@
     }
 
 }
+

--
Gitblit v1.9.1