From 2784496a8395930716ff4de285c2bce717abb907 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 21 五月 2023 16:56:06 +0800
Subject: [PATCH] 888

---
 zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java |  150 ++++++++++++++-----------------------------------
 1 files changed, 43 insertions(+), 107 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index 3093917..8bb6aba 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -1,10 +1,17 @@
 package com.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import lombok.ToString;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,166 +22,95 @@
  * @since 2023-03-14
  */
 @TableName("z_secret")
+@Data
+@ToString
 public class ZSecret implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
+
+    private Long userId;
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    private LocalDateTime createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name = "鍙戠敓鏃堕棿",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenTime;
 
     /**
      * 绉樺瘑淇℃伅绫诲埆
      */
-    private Integer type;
+    @Excel(name = "绫诲埆")
+    private String type;
 
     /**
      * 璐﹀彿锛堝惈鐞嗚储鏀剁泭锛�
      */
+    @Excel(name = "璐﹀彿")
     private String accNo;
 
     /**
      * 鏈夋晥鏈�
      */
-    private LocalDateTime validityDate;
+    @Excel(name = "鏈夋晥鏈�",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date validityDate;
 
     /**
      * 瀵嗙爜锛堝瓨鎶樺拰鍗$敤閫楀彿闅斿紑锛�
      */
+    @Excel(name = "瀵嗙爜")
     private String password;
 
     /**
      * 鏄惁寮�鍚寚绾癸紝0锛氬惁銆�1锛氭槸
      */
+    @Excel(name = "鏄惁寮�鍚寚绾�(鏄�/鍚�)",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isFinger;
 
     /**
      * 鏄惁寮�鍚汉鑴歌瘑鍒紝0锛氬惁銆�1锛氭槸
      */
+    @Excel(name = "鏄惁寮�鍚汉鑴歌瘑鍒�(鏄�/鍚�)",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isFace;
 
     /**
      * 鏄惁绉佹湁锛�0锛氬惁銆�1锛氭槸
      */
+    @Excel(name = "鏄惁绉佹湁(鏄�/鍚�)",readConverterExp = "0=鍚�,1=鏄�")
     private Integer isPrivate;
 
     /**
      * 瀛樻斁浣嶇疆
      */
+    @Excel(name = "瀛樻斁浣嶇疆")
     private String location;
 
     /**
      * 澶囨敞淇℃伅
      */
+    @Excel(name = "澶囨敞淇℃伅")
     private String remark;
 
+    /**
+     * 鐢靛瓙鏂囦欢璺緞
+     */
+    private String url;
 
-    public Integer getId() {
-        return id;
-    }
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenStartTime;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getAccNo() {
-        return accNo;
-    }
-
-    public void setAccNo(String accNo) {
-        this.accNo = accNo;
-    }
-
-    public LocalDateTime getValidityDate() {
-        return validityDate;
-    }
-
-    public void setValidityDate(LocalDateTime validityDate) {
-        this.validityDate = validityDate;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public Integer getIsFinger() {
-        return isFinger;
-    }
-
-    public void setIsFinger(Integer isFinger) {
-        this.isFinger = isFinger;
-    }
-
-    public Integer getIsFace() {
-        return isFace;
-    }
-
-    public void setIsFace(Integer isFace) {
-        this.isFace = isFace;
-    }
-
-    public Integer getIsPrivate() {
-        return isPrivate;
-    }
-
-    public void setIsPrivate(Integer isPrivate) {
-        this.isPrivate = isPrivate;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZSecret{" +
-        "id=" + id +
-        ", createTime=" + createTime +
-        ", type=" + type +
-        ", accNo=" + accNo +
-        ", validityDate=" + validityDate +
-        ", password=" + password +
-        ", isFinger=" + isFinger +
-        ", isFace=" + isFace +
-        ", isPrivate=" + isPrivate +
-        ", location=" + location +
-        ", remark=" + remark +
-        "}";
-    }
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date happenEndTime;
 }

--
Gitblit v1.9.1