码表获取

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) {
+    public JsonResult<?> list() {
-        List<EbikeDicValue> list = ebikeDicValueService.listByDicCode(dicCode);
+        List<EbikeDic> list = ebikeDicValueService.listDic();
         return JsonResult.success(list);
     }
 

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;
 }

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();
 }

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());
     }
 }