From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 182 +++++++++++++++++++++++----------------------
1 files changed, 93 insertions(+), 89 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 53f9f64..252f32c 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,125 +1,134 @@
package com.ruoyi.generator.domain;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 涓氬姟琛� gen_table
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("gen_table")
-public class GenTable
-{
- private static final long serialVersionUID = 1L;
+public class GenTable extends BaseEntity {
- /** 缂栧彿 */
- @TableId(value = "table_id", type = IdType.AUTO)
+ /**
+ * 缂栧彿
+ */
+ @TableId(value = "table_id")
private Long tableId;
- /** 琛ㄥ悕绉� */
+ /**
+ * 琛ㄥ悕绉�
+ */
@NotBlank(message = "琛ㄥ悕绉颁笉鑳戒负绌�")
private String tableName;
- /** 琛ㄦ弿杩� */
+ /**
+ * 琛ㄦ弿杩�
+ */
@NotBlank(message = "琛ㄦ弿杩颁笉鑳戒负绌�")
private String tableComment;
- /** 鍏宠仈鐖惰〃鐨勮〃鍚� */
+ /**
+ * 鍏宠仈鐖惰〃鐨勮〃鍚�
+ */
private String subTableName;
- /** 鏈〃鍏宠仈鐖惰〃鐨勫閿悕 */
+ /**
+ * 鏈〃鍏宠仈鐖惰〃鐨勫閿悕
+ */
private String subTableFkName;
- /** 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�) */
+ /**
+ * 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�)
+ */
@NotBlank(message = "瀹炰綋绫诲悕绉颁笉鑳戒负绌�")
private String className;
- /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級 */
+ /**
+ * 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級
+ */
private String tplCategory;
- /** 鐢熸垚鍖呰矾寰� */
+ /**
+ * 鐢熸垚鍖呰矾寰�
+ */
@NotBlank(message = "鐢熸垚鍖呰矾寰勪笉鑳戒负绌�")
private String packageName;
- /** 鐢熸垚妯″潡鍚� */
+ /**
+ * 鐢熸垚妯″潡鍚�
+ */
@NotBlank(message = "鐢熸垚妯″潡鍚嶄笉鑳戒负绌�")
private String moduleName;
- /** 鐢熸垚涓氬姟鍚� */
+ /**
+ * 鐢熸垚涓氬姟鍚�
+ */
@NotBlank(message = "鐢熸垚涓氬姟鍚嶄笉鑳戒负绌�")
private String businessName;
- /** 鐢熸垚鍔熻兘鍚� */
+ /**
+ * 鐢熸垚鍔熻兘鍚�
+ */
@NotBlank(message = "鐢熸垚鍔熻兘鍚嶄笉鑳戒负绌�")
private String functionName;
- /** 鐢熸垚浣滆�� */
+ /**
+ * 鐢熸垚浣滆��
+ */
@NotBlank(message = "浣滆�呬笉鑳戒负绌�")
private String functionAuthor;
- /** 鐢熸垚浠ｇ爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級 */
+ /**
+ * 鐢熸垚浠ｇ爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級
+ */
private String genType;
- /** 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級 */
+ /**
+ * 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級
+ */
private String genPath;
- /** 涓婚敭淇℃伅 */
+ /**
+ * 涓婚敭淇℃伅
+ */
@TableField(exist = false)
private GenTableColumn pkColumn;
- /** 瀛愯〃淇℃伅 */
+ /**
+ * 瀛愯〃淇℃伅
+ */
@TableField(exist = false)
private GenTable subTable;
- /** 琛ㄥ垪淇℃伅 */
+ /**
+ * 琛ㄥ垪淇℃伅
+ */
@Valid
@TableField(exist = false)
private List<GenTableColumn> columns;
- /** 鍏跺畠鐢熸垚閫夐」 */
+ /**
+ * 鍏跺畠鐢熸垚閫夐」
+ */
private String options;
-
- /**
- * 鍒涘缓鑰�
- */
- 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;
/**
* 澶囨敞
@@ -127,73 +136,68 @@
private String remark;
/**
- * 璇锋眰鍙傛暟
+ * 鏍戠紪鐮佸瓧娈�
*/
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
- /** 鏍戠紪鐮佸瓧娈� */
@TableField(exist = false)
private String treeCode;
- /** 鏍戠埗缂栫爜瀛楁 */
+ /**
+ * 鏍戠埗缂栫爜瀛楁
+ */
@TableField(exist = false)
private String treeParentCode;
- /** 鏍戝悕绉板瓧娈� */
+ /**
+ * 鏍戝悕绉板瓧娈�
+ */
@TableField(exist = false)
private String treeName;
- /** 涓婄骇鑿滃崟ID瀛楁 */
+ /**
+ * 涓婄骇鑿滃崟ID瀛楁
+ */
@TableField(exist = false)
private String parentMenuId;
- /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */
+ /**
+ * 涓婄骇鑿滃崟鍚嶇О瀛楁
+ */
@TableField(exist = false)
private String parentMenuName;
- public boolean isSub()
- {
+ public boolean isSub() {
return isSub(this.tplCategory);
}
- public static boolean isSub(String tplCategory)
- {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
+ public static boolean isSub(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
}
- public boolean isTree()
- {
+ public boolean isTree() {
return isTree(this.tplCategory);
}
- public static boolean isTree(String tplCategory)
- {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
+ public static boolean isTree(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
}
- public boolean isCrud()
- {
+ public boolean isCrud() {
return isCrud(this.tplCategory);
}
- public static boolean isCrud(String tplCategory)
- {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
+ public static boolean isCrud(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
}
- public boolean isSuperColumn(String javaField)
- {
+ public boolean isSuperColumn(String javaField) {
return isSuperColumn(this.tplCategory, javaField);
}
- public static boolean isSuperColumn(String tplCategory, String javaField)
- {
- if (isTree(tplCategory))
- {
- return StrUtil.equalsAnyIgnoreCase(javaField,
+ public static boolean isSuperColumn(String tplCategory, String javaField) {
+ if (isTree(tplCategory)) {
+ return StringUtils.equalsAnyIgnoreCase(javaField,
ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
- return StrUtil.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+ return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3