diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java index eed87ea9..574f190f 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java @@ -1,9 +1,11 @@ package com.kms.web.controller.system; +import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import java.util.List; +import java.util.Map; import cn.dev33.satoken.annotation.SaCheckLogin; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,14 +14,7 @@ import com.kms.system.service.SysDictDataService; import com.kms.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; @@ -125,4 +120,16 @@ public class SysDictDataController extends BaseController { return toAjax(dictDataService.deleteDictDataByIds(dictCodes)); } + + + /** + * 字典数据map(key:dictValue,value:dictLabel) + * @param dictType + * @return + */ + @ApiOperation("字典数据Map") + @GetMapping(value = "/map") + public Response> map(@RequestParam(required = false) String dictType) { + return Response.ok(dictDataService.selectMap(dictType)); + } } diff --git a/shuili-system/src/main/java/com/kms/system/service/SysDictDataService.java b/shuili-system/src/main/java/com/kms/system/service/SysDictDataService.java index 7d6ac059..a02a4f3f 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysDictDataService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysDictDataService.java @@ -1,5 +1,6 @@ package com.kms.system.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.domain.entity.SysDictData; import com.shuili.common.core.service.BaseService; @@ -12,6 +13,8 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 字典 业务层处理 @@ -130,4 +133,11 @@ public class SysDictDataService extends BaseService selectMap(String dictType) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(StringUtils.isNotBlank(dictType), SysDictData::getDictType, dictType); + List sysDictData = dictDataMapper.selectList(queryWrapper); + return sysDictData.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel)); + } }