From 03f383c6bb2ee62ae3ac5d21c75ef4e1ce105082 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Mon, 24 Mar 2025 10:32:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/DictController.java | 9 ++++ .../youlai/boot/system/mapper/DictMapper.java | 4 -- .../youlai/boot/system/model/vo/DictVO.java | 46 ------------------- .../boot/system/service/DictService.java | 15 ++++-- .../system/service/impl/DictServiceImpl.java | 15 ++++++ .../mapper/system/DictItemMapper.xml | 15 ------ .../resources/mapper/system/DictMapper.xml | 1 - 7 files changed, 36 insertions(+), 69 deletions(-) delete mode 100644 src/main/java/com/youlai/boot/system/model/vo/DictVO.java diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java index 5009f3a2..1944d1b3 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -1,6 +1,7 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.LogModuleEnum; @@ -56,6 +57,14 @@ public class DictController { return PageResult.success(result); } + + @Operation(summary = "字典列表") + @GetMapping + public Result>> getDictList() { + List> list = dictService.getDictList(); + return Result.success(list); + } + @Operation(summary = "字典表单数据") @GetMapping("/{id}/form") public Result getDictForm( diff --git a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java index a94bbb43..a40fbb29 100644 --- a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java @@ -2,15 +2,11 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; -import com.youlai.boot.system.model.vo.DictVO; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * 字典 访问层 * diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictVO.java deleted file mode 100644 index f0fdf5e9..00000000 --- a/src/main/java/com/youlai/boot/system/model/vo/DictVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.youlai.boot.system.model.vo; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - - -/** - * 字典数据项分页VO - * - * @author Ray - * @since 0.0.1 - */ -@Schema(description = "字典数据分页对象") -@Getter -@Setter -public class DictVO { - - @Schema(description = "字典名称") - private String name; - - @Schema(description = "字典编码") - private String dictCode; - - @Schema(description = "字典数据集合") - private List dictDataList; - - @Schema(description = "字典数据") - @Getter - @Setter - public static class DictData { - - @Schema(description = "字典数据值") - private String value; - - @Schema(description = "字典数据标签") - private String label; - - @Schema(description = "标签类型") - private String tagType; - } - -} diff --git a/src/main/java/com/youlai/boot/system/service/DictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java index c2ff8175..9778083a 100644 --- a/src/main/java/com/youlai/boot/system/service/DictService.java +++ b/src/main/java/com/youlai/boot/system/service/DictService.java @@ -2,12 +2,12 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Dict; import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictItemOptionVO; import com.youlai.boot.system.model.vo.DictPageVO; -import com.youlai.boot.system.model.vo.DictVO; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; public interface DictService extends IService { /** - * 字典分页列表 + * 获取字典分页列表 * * @param queryParams 分页查询对象 * @return 字典分页列表 @@ -28,7 +28,14 @@ public interface DictService extends IService { Page getDictPage(DictPageQuery queryParams); /** - * 获取字典表单详情 + * 获取字典列表 + * + * @return 字典列表 + */ + List> getDictList(); + + /** + * 获取字典表单数据 * * @param id 字典ID * @return 字典表单 @@ -66,4 +73,6 @@ public interface DictService extends IService { * @return 字典项列表 */ List getDictItems(String dictCode); + + } diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java index 8fc1a5bc..cd002be4 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.exception.BusinessException; +import com.youlai.boot.common.model.Option; import com.youlai.boot.system.converter.DictConverter; import com.youlai.boot.system.mapper.DictMapper; import com.youlai.boot.system.model.entity.Dict; @@ -49,6 +50,20 @@ public class DictServiceImpl extends ServiceImpl implements Di return this.baseMapper.getDictPage(new Page<>(pageNum, pageSize), queryParams); } + /** + * 获取字典列表 + * + * @return 字典列表 + */ + @Override + public List> getDictList() { + return this.list(new LambdaQueryWrapper().eq(Dict::getStatus, 1)) + .stream().map(item -> + new Option<>(item.getDictCode(), item.getName())) + .toList(); + } + + /** * 新增字典 * diff --git a/src/main/resources/mapper/system/DictItemMapper.xml b/src/main/resources/mapper/system/DictItemMapper.xml index 222b91f4..84856e78 100644 --- a/src/main/resources/mapper/system/DictItemMapper.xml +++ b/src/main/resources/mapper/system/DictItemMapper.xml @@ -28,19 +28,4 @@ - - - - diff --git a/src/main/resources/mapper/system/DictMapper.xml b/src/main/resources/mapper/system/DictMapper.xml index 7cbe631d..670694b4 100644 --- a/src/main/resources/mapper/system/DictMapper.xml +++ b/src/main/resources/mapper/system/DictMapper.xml @@ -25,5 +25,4 @@ ORDER BY t1.create_time DESC -