From 07f3517b6f178efea6150429a3867468b718e3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 18:20:29 +0800
Subject: [PATCH] fix 修复 用户登录与短信登录 国际化格式不一致
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 67 +++++++++++----------------------
1 files changed, 23 insertions(+), 44 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 05bc369..2fde8fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -1,41 +1,43 @@
package com.ruoyi.system.domain;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
-import java.util.Date;
/**
* 宀椾綅琛� sys_post
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("sys_post")
-public class SysPost {
- private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+public class SysPost extends BaseEntity {
/**
* 宀椾綅搴忓彿
*/
- @Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC)
- @TableId(value = "post_id", type = IdType.AUTO)
+ @ExcelProperty(value = "宀椾綅搴忓彿")
+ @TableId(value = "post_id")
private Long postId;
/**
* 宀椾綅缂栫爜
*/
- @Excel(name = "宀椾綅缂栫爜")
+ @ExcelProperty(value = "宀椾綅缂栫爜")
@NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
@Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�")
private String postCode;
@@ -43,7 +45,7 @@
/**
* 宀椾綅鍚嶇О
*/
- @Excel(name = "宀椾綅鍚嶇О")
+ @ExcelProperty(value = "宀椾綅鍚嶇О")
@NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String postName;
@@ -51,39 +53,16 @@
/**
* 宀椾綅鎺掑簭
*/
- @Excel(name = "宀椾綅鎺掑簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String postSort;
+ @ExcelProperty(value = "宀椾綅鎺掑簭")
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer postSort;
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
private String status;
-
- /**
- * 鍒涘缓鑰�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
/**
* 澶囨敞
--
Gitblit v1.9.3