From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 100 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 62 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 0b63729..280204b 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,34 +1,32 @@
package com.ruoyi.generator.domain;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
-import lombok.experimental.Accessors;
+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 org.apache.ibatis.type.JdbcType;
import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("gen_table_column")
-public class GenTableColumn implements Serializable {
- private static final long serialVersionUID = 1L;
+public class GenTableColumn extends BaseEntity {
/**
* 缂栧彿
*/
- @TableId(value = "column_id", type = IdType.AUTO)
+ @TableId(value = "column_id")
private Long columnId;
/**
@@ -44,6 +42,7 @@
/**
* 鍒楁弿杩�
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String columnComment;
/**
@@ -65,36 +64,43 @@
/**
* 鏄惁涓婚敭锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isPk;
/**
* 鏄惁鑷锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isIncrement;
/**
* 鏄惁蹇呭～锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isRequired;
/**
* 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isInsert;
/**
* 鏄惁缂栬緫瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isEdit;
/**
* 鏄惁鍒楄〃瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isList;
/**
* 鏄惁鏌ヨ瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isQuery;
/**
@@ -117,38 +123,8 @@
*/
private Integer sort;
- /**
- * 鍒涘缓鑰�
- */
- 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;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
-
public String getCapJavaField() {
- return StrUtil.upperFirst(javaField);
+ return StringUtils.capitalize(javaField);
}
public boolean isPk() {
@@ -156,7 +132,7 @@
}
public boolean isPk(String isPk) {
- return isPk != null && StrUtil.equals("1", isPk);
+ return isPk != null && StringUtils.equals("1", isPk);
}
public boolean isIncrement() {
@@ -164,7 +140,7 @@
}
public boolean isIncrement(String isIncrement) {
- return isIncrement != null && StrUtil.equals("1", isIncrement);
+ return isIncrement != null && StringUtils.equals("1", isIncrement);
}
public boolean isRequired() {
@@ -172,7 +148,7 @@
}
public boolean isRequired(String isRequired) {
- return isRequired != null && StrUtil.equals("1", isRequired);
+ return isRequired != null && StringUtils.equals("1", isRequired);
}
public boolean isInsert() {
@@ -180,7 +156,7 @@
}
public boolean isInsert(String isInsert) {
- return isInsert != null && StrUtil.equals("1", isInsert);
+ return isInsert != null && StringUtils.equals("1", isInsert);
}
public boolean isEdit() {
@@ -188,7 +164,7 @@
}
public boolean isEdit(String isEdit) {
- return isEdit != null && StrUtil.equals("1", isEdit);
+ return isEdit != null && StringUtils.equals("1", isEdit);
}
public boolean isList() {
@@ -196,7 +172,7 @@
}
public boolean isList(String isList) {
- return isList != null && StrUtil.equals("1", isList);
+ return isList != null && StringUtils.equals("1", isList);
}
public boolean isQuery() {
@@ -204,7 +180,7 @@
}
public boolean isQuery(String isQuery) {
- return isQuery != null && StrUtil.equals("1", isQuery);
+ return isQuery != null && StringUtils.equals("1", isQuery);
}
public boolean isSuperColumn() {
@@ -212,11 +188,11 @@
}
public static boolean isSuperColumn(String javaField) {
- return StrUtil.equalsAnyIgnoreCase(javaField,
- // BaseEntity
- "createBy", "createTime", "updateBy", "updateTime", "remark",
- // TreeEntity
- "parentName", "parentId", "orderNum", "ancestors");
+ return StringUtils.equalsAnyIgnoreCase(javaField,
+ // BaseEntity
+ "createBy", "createTime", "updateBy", "updateTime",
+ // TreeEntity
+ "parentName", "parentId");
}
public boolean isUsableColumn() {
@@ -225,15 +201,15 @@
public static boolean isUsableColumn(String javaField) {
// isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴�э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟
- return StrUtil.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+ return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
public String readConverterExp() {
- String remarks = StrUtil.subBetween(this.columnComment, "锛�", "锛�");
+ String remarks = StringUtils.substringBetween(this.columnComment, "锛�", "锛�");
StringBuffer sb = new StringBuffer();
- if (StrUtil.isNotEmpty(remarks)) {
+ if (StringUtils.isNotEmpty(remarks)) {
for (String value : remarks.split(" ")) {
- if (StrUtil.isNotEmpty(value)) {
+ if (StringUtils.isNotEmpty(value)) {
Object startStr = value.subSequence(0, 1);
String endStr = value.substring(1);
sb.append("").append(startStr).append("=").append(endStr).append(",");
--
Gitblit v1.9.3