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-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 360 ++++++++++++++++++------------------------------------------
1 files changed, 108 insertions(+), 252 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index e361df9..8c08d54 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -1,367 +1,223 @@
package com.ruoyi.generator.domain;
-import javax.validation.constraints.NotBlank;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class GenTableColumn extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
- /** 缂栧彿 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("gen_table_column")
+public class GenTableColumn extends BaseEntity {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId(value = "column_id")
private Long columnId;
- /** 褰掑睘琛ㄧ紪鍙� */
+ /**
+ * 褰掑睘琛ㄧ紪鍙�
+ */
private Long tableId;
- /** 鍒楀悕绉� */
+ /**
+ * 鍒楀悕绉�
+ */
private String columnName;
- /** 鍒楁弿杩� */
+ /**
+ * 鍒楁弿杩�
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String columnComment;
- /** 鍒楃被鍨� */
+ /**
+ * 鍒楃被鍨�
+ */
private String columnType;
- /** JAVA绫诲瀷 */
+ /**
+ * JAVA绫诲瀷
+ */
private String javaType;
- /** JAVA瀛楁鍚� */
+ /**
+ * JAVA瀛楁鍚�
+ */
@NotBlank(message = "Java灞炴�т笉鑳戒负绌�")
private String javaField;
- /** 鏄惁涓婚敭锛�1鏄級 */
+ /**
+ * 鏄惁涓婚敭锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isPk;
- /** 鏄惁鑷锛�1鏄級 */
+ /**
+ * 鏄惁鑷锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isIncrement;
- /** 鏄惁蹇呭～锛�1鏄級 */
+ /**
+ * 鏄惁蹇呭～锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isRequired;
- /** 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級 */
+ /**
+ * 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isInsert;
- /** 鏄惁缂栬緫瀛楁锛�1鏄級 */
+ /**
+ * 鏄惁缂栬緫瀛楁锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isEdit;
- /** 鏄惁鍒楄〃瀛楁锛�1鏄級 */
+ /**
+ * 鏄惁鍒楄〃瀛楁锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isList;
- /** 鏄惁鏌ヨ瀛楁锛�1鏄級 */
+ /**
+ * 鏄惁鏌ヨ瀛楁锛�1鏄級
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isQuery;
- /** 鏌ヨ鏂瑰紡锛圗Q绛変簬銆丯E涓嶇瓑浜庛�丟T澶т簬銆丩T灏忎簬銆丩IKE妯＄硦銆丅ETWEEN鑼冨洿锛� */
+ /**
+ * 鏌ヨ鏂瑰紡锛圗Q绛変簬銆丯E涓嶇瓑浜庛�丟T澶т簬銆丩T灏忎簬銆丩IKE妯＄硦銆丅ETWEEN鑼冨洿锛�
+ */
private String queryType;
- /** 鏄剧ず绫诲瀷锛坕nput鏂囨湰妗嗐�乼extarea鏂囨湰鍩熴�乻elect涓嬫媺妗嗐�乧heckbox澶嶉�夋銆乺adio鍗曢�夋銆乨atetime鏃ユ湡鎺т欢锛� */
+ /**
+ * 鏄剧ず绫诲瀷锛坕nput鏂囨湰妗嗐�乼extarea鏂囨湰鍩熴�乻elect涓嬫媺妗嗐�乧heckbox澶嶉�夋銆乺adio鍗曢�夋銆乨atetime鏃ユ湡鎺т欢銆乮mage鍥剧墖涓婁紶鎺т欢銆乽pload鏂囦欢涓婁紶鎺т欢銆乪ditor瀵屾枃鏈帶浠讹級
+ */
private String htmlType;
- /** 瀛楀吀绫诲瀷 */
+ /**
+ * 瀛楀吀绫诲瀷
+ */
private String dictType;
- /** 鎺掑簭 */
+ /**
+ * 鎺掑簭
+ */
private Integer sort;
- public void setColumnId(Long columnId)
- {
- this.columnId = columnId;
+ public String getCapJavaField() {
+ return StringUtils.uncapitalize(javaField);
}
- public Long getColumnId()
- {
- return columnId;
- }
-
- public void setTableId(Long tableId)
- {
- this.tableId = tableId;
- }
-
- public Long getTableId()
- {
- return tableId;
- }
-
- public void setColumnName(String columnName)
- {
- this.columnName = columnName;
- }
-
- public String getColumnName()
- {
- return columnName;
- }
-
- public void setColumnComment(String columnComment)
- {
- this.columnComment = columnComment;
- }
-
- public String getColumnComment()
- {
- return columnComment;
- }
-
- public void setColumnType(String columnType)
- {
- this.columnType = columnType;
- }
-
- public String getColumnType()
- {
- return columnType;
- }
-
- public void setJavaType(String javaType)
- {
- this.javaType = javaType;
- }
-
- public String getJavaType()
- {
- return javaType;
- }
-
- public void setJavaField(String javaField)
- {
- this.javaField = javaField;
- }
-
- public String getJavaField()
- {
- return javaField;
- }
-
- public void setIsPk(String isPk)
- {
- this.isPk = isPk;
- }
-
- public String getIsPk()
- {
- return isPk;
- }
-
- public boolean isPk()
- {
+ public boolean isPk() {
return isPk(this.isPk);
}
- public boolean isPk(String isPk)
- {
+ public boolean isPk(String isPk) {
return isPk != null && StringUtils.equals("1", isPk);
}
- public String getIsIncrement()
- {
- return isIncrement;
- }
-
- public void setIsIncrement(String isIncrement)
- {
- this.isIncrement = isIncrement;
- }
-
- public boolean isIncrement()
- {
+ public boolean isIncrement() {
return isIncrement(this.isIncrement);
}
- public boolean isIncrement(String isIncrement)
- {
+ public boolean isIncrement(String isIncrement) {
return isIncrement != null && StringUtils.equals("1", isIncrement);
}
- public void setIsRequired(String isRequired)
- {
- this.isRequired = isRequired;
- }
-
- public String getIsRequired()
- {
- return isRequired;
- }
-
- public boolean isRequired()
- {
+ public boolean isRequired() {
return isRequired(this.isRequired);
}
- public boolean isRequired(String isRequired)
- {
+ public boolean isRequired(String isRequired) {
return isRequired != null && StringUtils.equals("1", isRequired);
}
- public void setIsInsert(String isInsert)
- {
- this.isInsert = isInsert;
- }
-
- public String getIsInsert()
- {
- return isInsert;
- }
-
- public boolean isInsert()
- {
+ public boolean isInsert() {
return isInsert(this.isInsert);
}
- public boolean isInsert(String isInsert)
- {
+ public boolean isInsert(String isInsert) {
return isInsert != null && StringUtils.equals("1", isInsert);
}
- public void setIsEdit(String isEdit)
- {
- this.isEdit = isEdit;
- }
-
- public String getIsEdit()
- {
- return isEdit;
- }
-
- public boolean isEdit()
- {
+ public boolean isEdit() {
return isInsert(this.isEdit);
}
- public boolean isEdit(String isEdit)
- {
+ public boolean isEdit(String isEdit) {
return isEdit != null && StringUtils.equals("1", isEdit);
}
- public void setIsList(String isList)
- {
- this.isList = isList;
- }
-
- public String getIsList()
- {
- return isList;
- }
-
- public boolean isList()
- {
+ public boolean isList() {
return isList(this.isList);
}
- public boolean isList(String isList)
- {
+ public boolean isList(String isList) {
return isList != null && StringUtils.equals("1", isList);
}
- public void setIsQuery(String isQuery)
- {
- this.isQuery = isQuery;
- }
-
- public String getIsQuery()
- {
- return isQuery;
- }
-
- public boolean isQuery()
- {
+ public boolean isQuery() {
return isQuery(this.isQuery);
}
- public boolean isQuery(String isQuery)
- {
+ public boolean isQuery(String isQuery) {
return isQuery != null && StringUtils.equals("1", isQuery);
}
- public void setQueryType(String queryType)
- {
- this.queryType = queryType;
- }
-
- public String getQueryType()
- {
- return queryType;
- }
-
- public String getHtmlType()
- {
- return htmlType;
- }
-
- public void setHtmlType(String htmlType)
- {
- this.htmlType = htmlType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- public String getDictType()
- {
- return dictType;
- }
-
- public void setSort(Integer sort)
- {
- this.sort = sort;
- }
-
- public Integer getSort()
- {
- return sort;
- }
-
- public boolean isSuperColumn()
- {
+ public boolean isSuperColumn() {
return isSuperColumn(this.javaField);
}
- public static boolean isSuperColumn(String javaField)
- {
+ public static boolean isSuperColumn(String javaField) {
return StringUtils.equalsAnyIgnoreCase(javaField,
// BaseEntity
- "createBy", "createTime", "updateBy", "updateTime", "remark",
+ "createBy", "createTime", "updateBy", "updateTime",
// TreeEntity
- "parentName", "parentId", "orderNum", "ancestors");
+ "parentName", "parentId");
}
- public boolean isUsableColumn()
- {
+ public boolean isUsableColumn() {
return isUsableColumn(javaField);
}
- public static boolean isUsableColumn(String javaField)
- {
+ public static boolean isUsableColumn(String javaField) {
// isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴�э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟
- return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum");
+ return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
- public String readConverterExp()
- {
+ public String readConverterExp() {
String remarks = StringUtils.substringBetween(this.columnComment, "锛�", "锛�");
StringBuffer sb = new StringBuffer();
- if (StringUtils.isNotEmpty(remarks))
- {
- for (String value : remarks.split(" "))
- {
- if (StringUtils.isNotEmpty(value))
- {
+ if (StringUtils.isNotEmpty(remarks)) {
+ for (String value : remarks.split(" ")) {
+ if (StringUtils.isNotEmpty(value)) {
Object startStr = value.subSequence(0, 1);
String endStr = value.substring(1);
sb.append("").append(startStr).append("=").append(endStr).append(",");
}
}
return sb.deleteCharAt(sb.length() - 1).toString();
- }
- else
- {
+ } else {
return this.columnComment;
}
}
--
Gitblit v1.9.3