From 5b58ec9beb65c1c0f92aa175dbca53f565a53f34a1644e4871d0beecd647a88e Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Thu, 11 Sep 2025 14:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=81=E8=A1=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeDicValueController.java      |  8 ++++----
 .../com/cdzy/staff/model/entity/EbikeDic.java    |  4 ++++
 .../cdzy/staff/service/EbikeDicValueService.java |  3 +++
 .../service/impl/EbikeDicValueServiceImpl.java   | 16 +++++++++++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeDicValueController.java b/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeDicValueController.java
index d59a3f3..a5331ae 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeDicValueController.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeDicValueController.java
@@ -2,6 +2,7 @@ package com.cdzy.staff.controller;
 
 import com.cdzy.common.model.request.PageParam;
 import com.cdzy.common.model.response.JsonResult;
+import com.cdzy.staff.model.entity.EbikeDic;
 import com.cdzy.staff.model.entity.EbikeDicValue;
 import com.cdzy.staff.service.EbikeDicValueService;
 import com.mybatisflex.core.paginate.Page;
@@ -63,13 +64,12 @@ public class EbikeDicValueController {
     }
 
     /**
-     * 根据字典编码查询字典值列表
-     * @param dicCode 字典编码
+     * 获取字典和字典值
      * @return  列表
      */
     @GetMapping("list")
-    public JsonResult<?> list(@NotNull(message = "字典编码不能为空") String dicCode) {
-        List<EbikeDicValue> list = ebikeDicValueService.listByDicCode(dicCode);
+    public JsonResult<?> list() {
+        List<EbikeDic> list = ebikeDicValueService.listDic();
         return JsonResult.success(list);
     }
 
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeDic.java b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeDic.java
index c1d1a30..ab3f9d8 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeDic.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeDic.java
@@ -2,6 +2,7 @@ package com.cdzy.staff.model.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.RelationOneToMany;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  实体类。
@@ -57,4 +59,6 @@ public class EbikeDic implements Serializable {
     @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
+    @RelationOneToMany(selfField = "dicId",targetField = "dicId")
+    private List<EbikeDicValue> values;
 }
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/service/EbikeDicValueService.java b/ebike-staff/src/main/java/com/cdzy/staff/service/EbikeDicValueService.java
index 9c5b7fc..b6d4b4c 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/service/EbikeDicValueService.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/service/EbikeDicValueService.java
@@ -1,6 +1,7 @@
 package com.cdzy.staff.service;
 
 import com.cdzy.common.model.request.PageParam;
+import com.cdzy.staff.model.entity.EbikeDic;
 import com.cdzy.staff.model.entity.EbikeDicValue;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
@@ -18,4 +19,6 @@ public interface EbikeDicValueService extends IService<EbikeDicValue> {
     List<EbikeDicValue> listByDicCode(String dicCode);
 
     Page<EbikeDicValue> pageDicValue(PageParam pageParam,String dicCode);
+
+    List<EbikeDic> listDic();
 }
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeDicValueServiceImpl.java b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeDicValueServiceImpl.java
index 71a4164..7910938 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeDicValueServiceImpl.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeDicValueServiceImpl.java
@@ -1,7 +1,9 @@
 package com.cdzy.staff.service.impl;
 
 import com.cdzy.common.model.request.PageParam;
+import com.cdzy.staff.mapper.EbikeDicMapper;
 import com.cdzy.staff.mapper.EbikeDicValueMapper;
+import com.cdzy.staff.model.entity.EbikeDic;
 import com.cdzy.staff.model.entity.EbikeDicValue;
 import com.cdzy.staff.service.EbikeDicValueService;
 import com.mybatisflex.core.paginate.Page;
@@ -16,17 +18,20 @@ import static com.cdzy.staff.model.entity.table.EbikeDicTableDef.EBIKE_DIC;
 import static com.cdzy.staff.model.entity.table.EbikeDicValueTableDef.EBIKE_DIC_VALUE;
 
 /**
- *  服务层实现。
+ * 服务层实现。
  *
  * @author attiya
  * @since 2025-09-09
  */
 @Service
-public class EbikeDicValueServiceImpl extends ServiceImpl<EbikeDicValueMapper, EbikeDicValue>  implements EbikeDicValueService{
+public class EbikeDicValueServiceImpl extends ServiceImpl<EbikeDicValueMapper, EbikeDicValue> implements EbikeDicValueService {
 
     @Resource
     private EbikeDicValueMapper ebikeDicValueMapper;
 
+    @Resource
+    private EbikeDicMapper dicMapper;
+
     @Override
     public List<EbikeDicValue> listByDicCode(String dicCode) {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -40,6 +45,11 @@ public class EbikeDicValueServiceImpl extends ServiceImpl<EbikeDicValueMapper, E
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .leftJoin(EBIKE_DIC).on(EBIKE_DIC.DIC_ID.eq(EBIKE_DIC_VALUE.DIC_ID))
                 .where(EBIKE_DIC.DIC_CODE.eq(dicCode));
-        return ebikeDicValueMapper.paginate(pageParam.getPage(),queryWrapper);
+        return ebikeDicValueMapper.paginate(pageParam.getPage(), queryWrapper);
+    }
+
+    @Override
+    public List<EbikeDic> listDic() {
+        return dicMapper.selectListWithRelationsByQuery(new QueryWrapper());
     }
 }