yuejiajun/XMLTransformServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 字段不匹配问题，时间函数问题

Browse Source
This commit is contained in:
yuejiajun 2025-09-30 11:42:16 +08:00
parent 8a5de8e22a
commit 786a361254
4 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/example/demo/common/domain/BaseEntity.java
View File

@ -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 {
/**
* 创建时间
* <p>
* <hr/>
* 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 {
/**
* 更新时间
* <p>
* <hr/>
* 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 = "更新时间")

2
src/main/java/com/example/demo/common/domain/BaseVO.java
View File

@ -76,5 +76,5 @@ public class BaseVO implements Serializable {
* 是否删除（0：未删除，1：已删除）
*/
@Schema(description = "是否删除")
private String isDelete;
private String isDeleted;
}

6
src/main/java/com/example/demo/common/typography/BaseServiceImpl.java
View File

@ -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<String, Object> 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);

36
src/main/java/com/example/demo/parser/entity/ParseRuleEntity.java
View File

@ -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;
}