From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 167 +++++++++++++++++++++++++++----------------------------
1 files changed, 81 insertions(+), 86 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index c54678c..cdd7810 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -1,111 +1,106 @@
package com.ruoyi.system.domain;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 鍙傛暟閰嶇疆琛� sys_config
- *
+ *
* @author ruoyi
*/
-public class SysConfig extends BaseEntity
-{
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_config")
+@ExcelIgnoreUnannotated
+public class SysConfig implements Serializable {
private static final long serialVersionUID = 1L;
- /** 鍙傛暟涓婚敭 */
- @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
+ /**
+ * 鍙傛暟涓婚敭
+ */
+ @ExcelProperty(value = "鍙傛暟涓婚敭")
+ @TableId(value = "config_id", type = IdType.AUTO)
private Long configId;
- /** 鍙傛暟鍚嶇О */
- @Excel(name = "鍙傛暟鍚嶇О")
- private String configName;
-
- /** 鍙傛暟閿悕 */
- @Excel(name = "鍙傛暟閿悕")
- private String configKey;
-
- /** 鍙傛暟閿�� */
- @Excel(name = "鍙傛暟閿��")
- private String configValue;
-
- /** 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */
- @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄�,N=鍚�")
- private String configType;
-
- public Long getConfigId()
- {
- return configId;
- }
-
- public void setConfigId(Long configId)
- {
- this.configId = configId;
- }
-
+ /**
+ * 鍙傛暟鍚嶇О
+ */
+ @ExcelProperty(value = "鍙傛暟鍚嶇О")
@NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
- public String getConfigName()
- {
- return configName;
- }
+ private String configName;
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
+ /**
+ * 鍙傛暟閿悕
+ */
+ @ExcelProperty(value = "鍙傛暟閿悕")
@NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getConfigKey()
- {
- return configKey;
- }
+ private String configKey;
- public void setConfigKey(String configKey)
- {
- this.configKey = configKey;
- }
-
+ /**
+ * 鍙傛暟閿��
+ */
+ @ExcelProperty(value = "鍙傛暟閿��")
@NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
- public String getConfigValue()
- {
- return configValue;
- }
+ private String configValue;
- public void setConfigValue(String configValue)
- {
- this.configValue = configValue;
- }
+ /**
+ * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
+ */
+ @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_yes_no")
+ private String configType;
- public String getConfigType()
- {
- return configType;
- }
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- public void setConfigType(String configType)
- {
- this.configType = configType;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("configId", getConfigId())
- .append("configName", getConfigName())
- .append("configKey", getConfigKey())
- .append("configValue", getConfigValue())
- .append("configType", getConfigType())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /**
+ * 鏇存柊鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
}
--
Gitblit v1.9.3