From 868942e202aeb967b8ce47b38cc2433a636a128d Mon Sep 17 00:00:00 2001
From: phanes <5411232+phanes@user.noreply.gitee.com>
Date: 星期日, 16 一月 2022 17:46:24 +0800
Subject: [PATCH] update 格式化代码结构 统一编码格式
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 70 +++++++++--------------------------
1 files changed, 18 insertions(+), 52 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 5d5c6a4..915cf7d 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,38 +1,36 @@
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 lombok.*;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-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 implements Serializable {
- 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;
/**
@@ -133,41 +131,9 @@
private String options;
/**
- * 鍒涘缓鑰�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
* 澶囨敞
*/
private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
/**
* 鏍戠紪鐮佸瓧娈�
@@ -204,7 +170,7 @@
}
public static boolean isSub(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
}
public boolean isTree() {
@@ -212,7 +178,7 @@
}
public static boolean isTree(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
}
public boolean isCrud() {
@@ -220,7 +186,7 @@
}
public static boolean isCrud(String tplCategory) {
- return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
}
public boolean isSuperColumn(String javaField) {
@@ -229,9 +195,9 @@
public static boolean isSuperColumn(String tplCategory, String javaField) {
if (isTree(tplCategory)) {
- return StrUtil.equalsAnyIgnoreCase(javaField,
- ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+ 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