From 3eb6ea1ce6f381cb9545bb4906863f74236152a3 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期一, 20 十月 2025 17:10:33 +0800
Subject: [PATCH] Default Changelist
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 58 ++++++++++++++++++++++++----------------------------------
1 files changed, 24 insertions(+), 34 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 7f2920c..c983f8f 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,16 +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;
@@ -22,6 +25,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("sys_serial_rule")
public class SerialRule implements Serializable {
@@ -68,7 +72,7 @@
* 褰撳墠鍊�
*/
@ApiModelProperty(value= "褰撳墠鍊�")
- private String currValue;
+ private Integer currValue;
/**
* 鏈�杩戠敓鎴愮紪鐮�
@@ -82,11 +86,13 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
+ @ApiModelProperty(value = "娴佹按鍙锋渶澶ч暱搴�")
+ private Integer maxLen;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -106,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;
/**
@@ -119,7 +126,11 @@
*/
@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;
/**
* 澶囨敞
@@ -129,7 +140,7 @@
public SerialRule() {}
- public SerialRule(String code,String name,String delimit,String reset,String resetDep,String currValue,String lastCode,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public SerialRule(String code,String name,String delimit,String reset,String resetDep,Integer currValue,String lastCode,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.name = name;
this.delimit = delimit;
@@ -147,36 +158,15 @@
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; }
- switch (this.reset){
- case "year":
- return " 骞�";
- case "month":
- return " 鏈�";
- case "day":
- return " 澶�";
- default:
- return String.valueOf(this.reset);
+ 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);
}
public String getStatus$(){
--
Gitblit v1.9.1