From 786a361254e1e9f616413f9e4f3cd6496f4cb219 Mon Sep 17 00:00:00 2001
From: yuejiajun <1530620364@qq.com>
Date: Tue, 30 Sep 2025 11:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E5=87=BD=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../demo/common/domain/BaseEntity.java | 16 ++++++---
.../example/demo/common/domain/BaseVO.java | 2 +-
.../common/typography/BaseServiceImpl.java | 6 ++--
.../demo/parser/entity/ParseRuleEntity.java | 36 +++++++++++++++++++
4 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/demo/common/domain/BaseEntity.java b/src/main/java/com/example/demo/common/domain/BaseEntity.java
index 2eba9e5..c67a1eb 100644
--- a/src/main/java/com/example/demo/common/domain/BaseEntity.java
+++ b/src/main/java/com/example/demo/common/domain/BaseEntity.java
@@ -56,8 +56,8 @@ public class BaseEntity implements Serializable {
* 是否删除（0：未删除，1：已删除）
*/
@Column(isLogicDelete = true)
- @Schema(description = "是否删除")
- private String isDelete;
+ @Schema(description = "是否已删除")
+ private String isDeleted;
/**
* 乐观锁版本号
@@ -68,8 +68,12 @@ public class BaseEntity implements Serializable {
/**
* 创建时间
+ *
+ *
+ * Column(onInsertValue = "now()")
+ * Column(onInsertValue = "CURRENT_TIMESTAMP")
*/
- @Column(onInsertValue = "now()")
+ @Column(onInsertValue = "CURRENT_TIMESTAMP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(description = "创建时间")
@@ -83,8 +87,12 @@ public class BaseEntity implements Serializable {
/**
* 更新时间
+ *
+ *
+ * Column(onUpdateValue = "now()", onInsertValue = "now()")
+ * Column(onUpdateValue = "CURRENT_TIMESTAMP", onInsertValue = "CURRENT_TIMESTAMP")
*/
- @Column(onUpdateValue = "now()", onInsertValue = "now()")
+ @Column(onUpdateValue = "CURRENT_TIMESTAMP", onInsertValue = "CURRENT_TIMESTAMP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(description = "更新时间")
diff --git a/src/main/java/com/example/demo/common/domain/BaseVO.java b/src/main/java/com/example/demo/common/domain/BaseVO.java
index 55dceed..87a4410 100644
--- a/src/main/java/com/example/demo/common/domain/BaseVO.java
+++ b/src/main/java/com/example/demo/common/domain/BaseVO.java
@@ -76,5 +76,5 @@ public class BaseVO implements Serializable {
* 是否删除（0：未删除，1：已删除）
*/
@Schema(description = "是否删除")
- private String isDelete;
+ private String isDeleted;
}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/common/typography/BaseServiceImpl.java b/src/main/java/com/example/demo/common/typography/BaseServiceImpl.java
index 0927bf0..ca81778 100644
--- a/src/main/java/com/example/demo/common/typography/BaseServiceImpl.java
+++ b/src/main/java/com/example/demo/common/typography/BaseServiceImpl.java
@@ -105,7 +105,7 @@ public abstract class BaseServiceImpl<
// 模糊查询
.field(VO::getName, dto.getFuzzy()).op(Contain.class)
// 未删除数据
- .field(VO::getIsDelete, GlobalConstants.N)
+ .field(VO::getIsDeleted, GlobalConstants.N)
// 分页排序，默认强制按照更新时间倒序，单词正序
.orderBy(VO::getUpdatedTime).desc()
.orderBy(VO::getName).asc()
@@ -133,7 +133,7 @@ public abstract class BaseServiceImpl<
// 下拉框，允许模糊筛选
.field(VO::getName, dto.getFuzzy()).op(Contain.class)
// 下拉框，只能查询未删除的数据
- .field(VO::getIsDelete, GlobalConstants.N)
+ .field(VO::getIsDeleted, GlobalConstants.N)
// 下拉框，强制使用单词正序，时间倒序
.orderBy(VO::getName).asc()
.orderBy(VO::getCreatedTime).desc()
@@ -151,7 +151,7 @@ public abstract class BaseServiceImpl<
public VO detail(String id) {
Map paramMap = MapUtils.builder()
.field(VO::getId, id)
- .field(VO::getIsDelete, GlobalConstants.N)
+ .field(VO::getIsDeleted, GlobalConstants.N)
.build();
VO wordVO = beanSearcher.searchFirst(this.clazzVO, paramMap);
diff --git a/src/main/java/com/example/demo/parser/entity/ParseRuleEntity.java b/src/main/java/com/example/demo/parser/entity/ParseRuleEntity.java
index 98cba6d..6e8c3e0 100644
--- a/src/main/java/com/example/demo/parser/entity/ParseRuleEntity.java
+++ b/src/main/java/com/example/demo/parser/entity/ParseRuleEntity.java
@@ -40,6 +40,18 @@ public class ParseRuleEntity extends BaseEntity {
@Schema(description = "标签类型")
private String tagType;
+ /**
+ * TXT文件中的键名
+ */
+ @Schema(description = "TXT文件中的键名")
+ private String txtKey;
+
+ /**
+ * 父级标签
+ */
+ @Schema(description = "父级标签")
+ private String parentTag;
+
/**
* 是否允许为空：0-不允许，1-允许
*/
@@ -51,4 +63,28 @@ public class ParseRuleEntity extends BaseEntity {
*/
@Schema(description = "节点路径")
private String nodePath;
+
+ /**
+ * 是否必填：0-否，1-是
+ */
+ @Schema(description = "是否必填")
+ private Integer isRequired;
+
+ /**
+ * 默认值
+ */
+ @Schema(description = "默认值")
+ private String defaultValue;
+
+ /**
+ * 描述信息
+ */
+ @Schema(description = "描述信息")
+ private String description;
+
+ /**
+ * 排序顺序
+ */
+ @Schema(description = "排序顺序")
+ private Integer sortOrder;
}
\ No newline at end of file