From c7989bec9ab37ded095c23e9f71c73d747c05504 Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Sat, 21 Sep 2024 14:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/youchain/modules/system/domain/Dict.java  |  5 +++++
 .../youchain/modules/system/rest/DictController.java   | 10 ++++++++++
 .../youchain/modules/system/service/dto/DictDto.java   |  4 ++++
 .../modules/system/service/dto/DictQueryCriteria.java  |  3 +++
 4 files changed, 22 insertions(+)

diff --git a/youchain-system/src/main/java/com/youchain/modules/system/domain/Dict.java b/youchain-system/src/main/java/com/youchain/modules/system/domain/Dict.java
index e0fe609..6914e31 100644
--- a/youchain-system/src/main/java/com/youchain/modules/system/domain/Dict.java
+++ b/youchain-system/src/main/java/com/youchain/modules/system/domain/Dict.java
@@ -45,10 +45,15 @@ public class Dict extends BaseEntity implements Serializable {
     @OneToMany(mappedBy = "dict",cascade={CascadeType.PERSIST,CascadeType.REMOVE})
     private List<DictDetail> dictDetails;
 
+    @ApiModelProperty(value = "代码")
+    private String code;
     @NotBlank
     @ApiModelProperty(value = "名称")
     private String name;
 
     @ApiModelProperty(value = "描述")
     private String description;
+
+    @ApiModelProperty(value = "类型;0普通，1规则")
+    private String type;
 }
\ No newline at end of file
diff --git a/youchain-system/src/main/java/com/youchain/modules/system/rest/DictController.java b/youchain-system/src/main/java/com/youchain/modules/system/rest/DictController.java
index 0d3e941..d9e6e57 100644
--- a/youchain-system/src/main/java/com/youchain/modules/system/rest/DictController.java
+++ b/youchain-system/src/main/java/com/youchain/modules/system/rest/DictController.java
@@ -60,10 +60,20 @@ public class DictController {
         return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK);
     }
 
+    @ApiOperation("查询字典")
+    @GetMapping(value = "/queryRule")
+    @PreAuthorize("@el.check('dict:list')")
+    public ResponseEntity<Object> queryRule(DictQueryCriteria resources, Pageable pageable){
+        resources.setType("1");
+        return new ResponseEntity<>(dictService.queryAll(resources,pageable),HttpStatus.OK);
+    }
+
+
     @ApiOperation("查询字典")
     @GetMapping
     @PreAuthorize("@el.check('dict:list')")
     public ResponseEntity<Object> queryDict(DictQueryCriteria resources, Pageable pageable){
+        resources.setType("0");
         return new ResponseEntity<>(dictService.queryAll(resources,pageable),HttpStatus.OK);
     }
 
diff --git a/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictDto.java b/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictDto.java
index dc22208..d5b9c5e 100644
--- a/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictDto.java
+++ b/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictDto.java
@@ -33,7 +33,11 @@ public class DictDto extends BaseDTO implements Serializable {
 
     private List<DictDetailDto> dictDetails;
 
+    private String code;
+
     private String name;
 
     private String description;
+
+    private String type;
 }
diff --git a/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictQueryCriteria.java b/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictQueryCriteria.java
index 13964bc..fa23520 100644
--- a/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictQueryCriteria.java
+++ b/youchain-system/src/main/java/com/youchain/modules/system/service/dto/DictQueryCriteria.java
@@ -27,4 +27,7 @@ public class DictQueryCriteria {
 
     @Query(blurry = "name,description")
     private String blurry;
+
+    @Query(type = Query.Type.EQUAL)
+    private String type;
 }