From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 153 ++++++++++++++++++++++++++++----------------------
1 files changed, 86 insertions(+), 67 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 737966a..3c572bd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -1,96 +1,115 @@
package com.ruoyi.common.core.domain.entity;
-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.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.util.Date;
/**
* 瀛楀吀鏁版嵁琛� sys_dict_data
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dict_data")
-public class SysDictData
-{
- private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄")
+public class SysDictData extends BaseEntity {
- /** 瀛楀吀缂栫爜 */
- @Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
- @TableId(value = "dept_code",type = IdType.AUTO)
- private Long dictCode;
+ /**
+ * 瀛楀吀缂栫爜
+ */
+ @ApiModelProperty(value = "瀛楀吀缂栫爜")
+ @ExcelProperty(value = "瀛楀吀缂栫爜")
+ @TableId(value = "dict_code")
+ private Long dictCode;
- /** 瀛楀吀鎺掑簭 */
- @Excel(name = "瀛楀吀鎺掑簭", cellType = ColumnType.NUMERIC)
- private Long dictSort;
+ /**
+ * 瀛楀吀鎺掑簭
+ */
+ @ApiModelProperty(value = "瀛楀吀鎺掑簭")
+ @ExcelProperty(value = "瀛楀吀鎺掑簭")
+ private Long dictSort;
- /** 瀛楀吀鏍囩 */
- @Excel(name = "瀛楀吀鏍囩")
- @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String dictLabel;
+ /**
+ * 瀛楀吀鏍囩
+ */
+ @ApiModelProperty(value = "瀛楀吀鏍囩")
+ @ExcelProperty(value = "瀛楀吀鏍囩")
+ @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String dictLabel;
- /** 瀛楀吀閿�� */
- @Excel(name = "瀛楀吀閿��")
- @NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
- @Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
- private String dictValue;
+ /**
+ * 瀛楀吀閿��
+ */
+ @ApiModelProperty(value = "瀛楀吀閿��")
+ @ExcelProperty(value = "瀛楀吀閿��")
+ @NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
+ @Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
+ private String dictValue;
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- private String dictType;
+ /**
+ * 瀛楀吀绫诲瀷
+ */
+ @ApiModelProperty(value = "瀛楀吀绫诲瀷")
+ @ExcelProperty(value = "瀛楀吀绫诲瀷")
+ @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ private String dictType;
- /** 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛� */
- @Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
- private String cssClass;
+ /**
+ * 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�
+ */
+ @ApiModelProperty(value = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�")
+ @Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
+ private String cssClass;
- /** 琛ㄦ牸瀛楀吀鏍峰紡 */
- private String listClass;
+ /**
+ * 琛ㄦ牸瀛楀吀鏍峰紡
+ */
+ @ApiModelProperty(value = "琛ㄦ牸瀛楀吀鏍峰紡")
+ private String listClass;
- /** 鏄惁榛樿锛圷鏄� N鍚︼級 */
- @Excel(name = "鏄惁榛樿", readConverterExp = "Y=鏄�,N=鍚�")
- private String isDefault;
+ /**
+ * 鏄惁榛樿锛圷鏄� N鍚︼級
+ */
+ @ApiModelProperty(value = "鏄惁榛樿锛圷鏄� N鍚︼級")
+ @ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_yes_no")
+ private String isDefault;
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
+ /**
+ * 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @ApiModelProperty(value = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
+ @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_normal_disable")
+ private String status;
- /** 鍒涘缓鑰� */
- private String createBy;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
- /** 鍒涘缓鏃堕棿 */
- @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;
-
- /** 澶囨敞 */
- private String remark;
-
- public boolean getDefault()
- {
- return UserConstants.YES.equals(this.isDefault) ? true : false;
- }
+ public boolean getDefault() {
+ return UserConstants.YES.equals(this.isDefault);
+ }
}
--
Gitblit v1.9.3