diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java index 50f85d6e..f55c7490 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java @@ -17,15 +17,19 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; +import org.springblade.core.tool.utils.StringPool; import org.springblade.system.entity.DictBiz; import org.springblade.system.service.IDictBizService; import org.springblade.system.vo.DictBizVO; @@ -175,5 +179,27 @@ public class DictBizController extends BladeController { return R.data(DictBizWrapper.build().listNodeVO(tree)); } + /** + * 字典键值列表 + */ + @GetMapping("/select") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "字典键值列表", notes = "字典键值列表") + public R> select() { + List list = dictService.list(Wrappers.query().lambda().eq(DictBiz::getParentId, CommonConstant.TOP_PARENT_ID)); + list.forEach(dict -> dict.setDictValue(dict.getCode() + StringPool.COLON + StringPool.SPACE + dict.getDictValue())); + return R.data(list); + } + + /** + * 字典全列表 + */ + @GetMapping("/select-all") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "字典全列表", notes = "字典全列表") + public R> selectAll() { + List list = dictService.list(Wrappers.query().lambda().eq(DictBiz::getIsDeleted, BladeConstant.DB_NOT_DELETED)); + return R.data(list); + } } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java index cd3708b2..2b8bbe40 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java @@ -28,6 +28,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.StringPool; import org.springblade.system.entity.Dict; import org.springblade.system.service.IDictService; @@ -192,5 +193,16 @@ public class DictController extends BladeController { return R.data(list); } + /** + * 字典全列表 + */ + @GetMapping("/select-all") + @ApiOperationSupport(order = 11) + @ApiOperation(value = "字典全列表", notes = "字典全列表") + public R> selectAll() { + List list = dictService.list(Wrappers.query().lambda().eq(Dict::getIsDeleted, BladeConstant.DB_NOT_DELETED)); + return R.data(list); + } + }