From e14683bc64ccddf185af9d93bf857d5b2317427f Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Mon, 26 Aug 2024 10:36:20 +0800
Subject: [PATCH] Changes

---
 .../src/main/java/rule/domain/RuleEdition.java |  7 +++++--
 .../muyu/rule/controller/RuleController.java   |  5 +++++
 .../rule/controller/RuleEditionController.java | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java b/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java
index 94d3779..b6b2107 100644
--- a/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java
+++ b/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java
@@ -28,7 +28,7 @@ public class RuleEdition {
     /**
      * 版本主键
      */
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 版本类
@@ -58,5 +58,8 @@ public class RuleEdition {
      * 内容
      */
     private String ruleContent;
-
+    /**
+     * 规则Id
+     */
+    private Long ruleId;
 }
diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java
index 2861109..f2b7c86 100644
--- a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java
+++ b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java
@@ -86,6 +86,11 @@ public class RuleController {
         util.exportExcel(response, list, "规则");
     }
 
+    /**
+     * 通过id查询
+     * @param id
+     * @return
+     */
     @GetMapping("/findById/{id}")
     @Operation(summary = "规则详细", description = "规则详细")
     public Result findById(@PathVariable("id") Long id) {
diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java
index 837514b..b96e8d5 100644
--- a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java
+++ b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java
@@ -1,11 +1,13 @@
 package com.muyu.rule.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.muyu.common.core.domain.Result;
 import com.muyu.rule.service.RuleEditionService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import rule.domain.Rule;
 import rule.domain.RuleEdition;
 
 import java.util.List;
@@ -82,6 +84,7 @@ public class RuleEditionController {
         this.ruleEditionService.disable(id);
         return Result.success(null, "操作成功");
     }
+
     /**
      * 通过ID启用规则版本
      *
@@ -94,4 +97,19 @@ public class RuleEditionController {
         this.ruleEditionService.enable(id);
         return Result.success(null, "操作成功");
     }
+
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/findById/{id}")
+    @Operation(summary = "规则详细", description = "规则详细")
+    public Result findById(@PathVariable("id") Long id) {
+        return Result.success(ruleEditionService.list(new LambdaQueryWrapper<>() {{
+            eq(RuleEdition::getRuleId, id);
+        }}));
+    }
 }