From 4977eae5cb2cf0280233d0771c2097cca2f63a87 Mon Sep 17 00:00:00 2001 From: yuan <1363654894@qq.com> Date: Fri, 6 Sep 2024 16:07:06 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/common/domain/RuleVersion.java | 4 ++-- .../java/com/muyu/controller/RuleVersionController.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java index 5e36047..33c828d 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java @@ -90,9 +90,9 @@ public class RuleVersion extends BaseEntity { } - public static RuleVersion updCodeBuild(RuleVersionUpdCodeReq ruleVersionUpdCodeReq) { + public static RuleVersion updCodeBuild(RuleVersionUpdCodeReq ruleVersionUpdCodeReq, Supplier idSupplier) { return RuleVersion.builder() - .ruleId(ruleVersionUpdCodeReq.getRuleVersionId()) + .ruleId(idSupplier.get()) .ruleVersionText(ruleVersionUpdCodeReq.getRuleVersionText()) .build(); } diff --git a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java index 7187cef..1ed671e 100644 --- a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java +++ b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java @@ -129,16 +129,17 @@ public class RuleVersionController { /** * 通过ID修改版本代码 * @param ruleVersionId - * @param ruleVersionUpdReq + * @param ruleVersionUpdCodeReq * @return */ @PutMapping("/updText/{ruleVersionId}") @Operation(summary = "通过ID修改规则版本代码",description = "进行版本更新时操作") public Result updText( + @Schema(title = "版本ID",type = "Long",defaultValue = "1",description = "通过ID修改版本代码") @PathVariable("ruleVersionId") Long ruleVersionId, - @Validated @RequestBody RuleVersionUpdReq ruleVersionUpdReq + @Validated @RequestBody RuleVersionUpdCodeReq ruleVersionUpdCodeReq ){ - ruleVersionService.updateById(RuleVersion.updBuild(ruleVersionUpdReq,() -> ruleVersionId)); + ruleVersionService.updateById(RuleVersion.updCodeBuild(ruleVersionUpdCodeReq,() -> ruleVersionId)); return Result.success(null,"操作成功"); }