From 7e855776c1bbd5a6a9d3550caa464a7eeb836780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E9=91=AB?= Date: Thu, 18 Jan 2024 19:24:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AEmap=E6=8E=A5=E5=8F=A3=EF=BC=88key=EF=BC=9Aval?= =?UTF-8?q?ue=20value=EF=BC=9Alabel=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDictDataController.java | 14 ++++++++++++++ .../com/kms/system/service/SysDictDataService.java | 10 ++++++++++ 2 files changed, 24 insertions(+) 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..e760ab65 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 @@ -125,4 +125,18 @@ public class SysDictDataController extends BaseController { return toAjax(dictDataService.deleteDictDataByIds(dictCodes)); } + + + /** + * 字典数据map(key:dictValue,value:dictLabel) + * @param dict + * @return + */ + @ApiOperation("字典数据Map") + @SaCheckLogin + @PostMapping(value = "/map") + @SaCheckPermission(value = "system:dict:map") + public AjaxResult map(@RequestBody SysDictData dict) { + return AjaxResult.success(dictDataService.selectMap(dict)); + } } 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..38eb0f3d 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(SysDictData dict) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(StringUtils.isNotBlank(dict.getDictType()), SysDictData::getDictType, dict.getDictType()); + List sysDictData = dictDataMapper.selectList(queryWrapper); + return sysDictData.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel)); + } } From 522a0673554b928d191000fb26a8602064506e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E9=91=AB?= Date: Thu, 18 Jan 2024 19:27:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AEmap=E6=8E=A5=E5=8F=A3=EF=BC=88key=EF=BC=9Aval?= =?UTF-8?q?ue=20value=EF=BC=9Alabel=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/controller/system/SysDictDataController.java | 1 - 1 file changed, 1 deletion(-) 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 e760ab65..e5168fde 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 @@ -135,7 +135,6 @@ public class SysDictDataController extends BaseController @ApiOperation("字典数据Map") @SaCheckLogin @PostMapping(value = "/map") - @SaCheckPermission(value = "system:dict:map") public AjaxResult map(@RequestBody SysDictData dict) { return AjaxResult.success(dictDataService.selectMap(dict)); } From 147d90c08a322d0903189e257100f7cb04da8b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E9=91=AB?= Date: Thu, 18 Jan 2024 19:35:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AEmap=E6=8E=A5=E5=8F=A3=EF=BC=88key=EF=BC=9Aval?= =?UTF-8?q?ue=20value=EF=BC=9Alabel=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysDictDataController.java | 17 +++++------------ .../kms/system/service/SysDictDataService.java | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) 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 e5168fde..01d69755 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 @@ -12,14 +12,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; @@ -129,13 +122,13 @@ public class SysDictDataController extends BaseController /** * 字典数据map(key:dictValue,value:dictLabel) - * @param dict + * @param dictType * @return */ @ApiOperation("字典数据Map") @SaCheckLogin - @PostMapping(value = "/map") - public AjaxResult map(@RequestBody SysDictData dict) { - return AjaxResult.success(dictDataService.selectMap(dict)); + @GetMapping(value = "/map") + public AjaxResult map(@RequestParam(required = false) String dictType) { + return AjaxResult.success(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 38eb0f3d..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 @@ -133,10 +133,10 @@ public class SysDictDataService extends BaseService selectMap(SysDictData dict) { + public Map selectMap(String dictType) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(StringUtils.isNotBlank(dict.getDictType()), SysDictData::getDictType, dict.getDictType()); + .eq(StringUtils.isNotBlank(dictType), SysDictData::getDictType, dictType); List sysDictData = dictDataMapper.selectList(queryWrapper); return sysDictData.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel)); } From b1f89af0aab8bda04f6746860851b43ff3588948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E9=91=AB?= Date: Thu, 18 Jan 2024 19:59:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AEmap=E6=8E=A5=E5=8F=A3=EF=BC=88key=EF=BC=9Aval?= =?UTF-8?q?ue=20value=EF=BC=9Alabel=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/controller/system/SysDictDataController.java | 1 - 1 file changed, 1 deletion(-) 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 01d69755..d3b483a9 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 @@ -126,7 +126,6 @@ public class SysDictDataController extends BaseController * @return */ @ApiOperation("字典数据Map") - @SaCheckLogin @GetMapping(value = "/map") public AjaxResult map(@RequestParam(required = false) String dictType) { return AjaxResult.success(dictDataService.selectMap(dictType)); From c15cc70ab50e6ccf0b1abcc50da361ff8b8dd059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E9=91=AB?= Date: Thu, 18 Jan 2024 20:08:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AEmap=E6=8E=A5=E5=8F=A3=EF=BC=88key=EF=BC=9Aval?= =?UTF-8?q?ue=20value=EF=BC=9Alabel=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/web/controller/system/SysDictDataController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 d3b483a9..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; @@ -127,7 +129,7 @@ public class SysDictDataController extends BaseController */ @ApiOperation("字典数据Map") @GetMapping(value = "/map") - public AjaxResult map(@RequestParam(required = false) String dictType) { - return AjaxResult.success(dictDataService.selectMap(dictType)); + public Response> map(@RequestParam(required = false) String dictType) { + return Response.ok(dictDataService.selectMap(dictType)); } }