diff --git a/src/main/java/com/example/demo/common/domain/BaseDTO.java b/src/main/java/com/example/demo/common/domain/BaseDTO.java index 4d681e1..c527728 100644 --- a/src/main/java/com/example/demo/common/domain/BaseDTO.java +++ b/src/main/java/com/example/demo/common/domain/BaseDTO.java @@ -1,5 +1,6 @@ package com.example.demo.common.domain; +import com.mybatisflex.annotation.Column; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; @@ -31,28 +32,61 @@ public class BaseDTO implements Serializable { */ @Schema(description = "ID") private String id; - + /** - * 创建时间 + * 命名空间 */ - @Schema(description = "创建时间") - private Date createdTime; - + @Schema(description = "命名空间") + private String nameSpace; + /** - * 创建人ID + * 排序字段 */ - @Schema(description = "创建人ID") - private String createdId; - + @Schema(description = "排序字段") + private String sortName; + /** - * 更新时间 + * 是否删除(0:未删除,1:已删除) */ - @Schema(description = "更新时间") - private Date updatedTime; - + @Column(isLogicDelete = true) + @Schema(description = "是否删除") + private String isDelete; + /** - * 更新人ID + * 乐观锁版本号 */ - @Schema(description = "更新人ID") - private String updatedId; + @Column(version = true) + @Schema(description = "乐观锁版本号") + private Integer revision; + + // 创建时间、创建ID、更新时间、更新ID,不允许前端或API直接控制 +// /** +// * 创建时间 +// */ +// @Schema(description = "创建时间") +// private Date createdTime; +// +// /** +// * 创建人ID +// */ +// @Schema(description = "创建人ID") +// private String createdId; +// +// /** +// * 更新时间 +// */ +// @Schema(description = "更新时间") +// private Date updatedTime; +// +// /** +// * 更新人ID +// */ +// @Schema(description = "更新人ID") +// private String updatedId; + + /** + * 租户ID + */ + @Schema(description = "租户ID") + private String tenantId; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/parser/controller/MapperRuleController.java b/src/main/java/com/example/demo/parser/controller/MapperRuleController.java index 2cda258..7bdae7d 100644 --- a/src/main/java/com/example/demo/parser/controller/MapperRuleController.java +++ b/src/main/java/com/example/demo/parser/controller/MapperRuleController.java @@ -65,6 +65,8 @@ public class MapperRuleController { @PutMapping("/{ruleId}") @Operation(summary = "更新映射规则", description = "更新指定的映射规则") public Wrapper updateRule( + @Parameter(description = "规则ID", required = true) + @PathVariable String ruleId, @Parameter(description = "映射规则数据", required = true) @RequestBody MapperRuleDTO rule) { try { diff --git a/src/main/java/com/example/demo/parser/controller/ParseRuleController.java b/src/main/java/com/example/demo/parser/controller/ParseRuleController.java index 7e4e902..c880f07 100644 --- a/src/main/java/com/example/demo/parser/controller/ParseRuleController.java +++ b/src/main/java/com/example/demo/parser/controller/ParseRuleController.java @@ -65,6 +65,8 @@ public class ParseRuleController { @PutMapping("/{ruleId}") @Operation(summary = "更新解析规则", description = "更新指定的解析规则") public Wrapper updateRule( + @Parameter(description = "规则ID", required = true) + @PathVariable String ruleId, @Parameter(description = "解析规则数据", required = true) @RequestBody ParseRuleDTO rule) { try { diff --git a/src/main/java/com/example/demo/parser/service/impl/FileRecordServiceImpl.java b/src/main/java/com/example/demo/parser/service/impl/FileRecordServiceImpl.java index fb94590..c0bcc4d 100644 --- a/src/main/java/com/example/demo/parser/service/impl/FileRecordServiceImpl.java +++ b/src/main/java/com/example/demo/parser/service/impl/FileRecordServiceImpl.java @@ -27,6 +27,12 @@ public class FileRecordServiceImpl extends BaseServiceImpl implements FileRecordService { + /** + * 构造函数 + * + * @param beanSearcher BeanSearcher实例,用于高级查询 + * @param transService 翻译服务实例,用于字段翻译 + */ public FileRecordServiceImpl( BeanSearcher beanSearcher, TransService transService