From c84f63c2109334c00c26a5070bded054f364492e Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 27 Jun 2023 16:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90dict=20type?= =?UTF-8?q?=E3=80=91=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DictTypeController.java | 8 ++-- .../dict/modular/service/DictTypeService.java | 20 --------- .../service/impl/DictTypeServiceImpl.java | 44 ++++--------------- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java index 009f936dd..f3936da68 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java @@ -101,7 +101,7 @@ public class DictTypeController { * @author fengshuonan * @since 2021/1/13 11:25 */ - @GetResource(name = "获取字典类型详情", path = "/dictType/detail", requiredPermission = false) + @GetResource(name = "获取字典类型详情", path = "/dictType/detail") public ResponseData detail(@Validated(BaseRequest.detail.class) DictTypeRequest dictTypeRequest) { SysDictType detail = this.dictTypeService.detail(dictTypeRequest); return new SuccessResponseData<>(detail); @@ -113,7 +113,7 @@ public class DictTypeController { * @author fengshuonan * @since 2020/10/30 21:46 */ - @GetResource(name = "获取字典类型列表", path = "/dictType/list", requiredPermission = false) + @GetResource(name = "获取字典类型列表", path = "/dictType/list") public ResponseData> list(DictTypeRequest dictTypeRequest) { return new SuccessResponseData<>(dictTypeService.findList(dictTypeRequest)); } @@ -124,7 +124,7 @@ public class DictTypeController { * @author fengshuonan * @since 2021/1/13 11:25 */ - @GetResource(name = "获取系统配置字典类型详情", path = "/dictType/getConfigDictTypeDetail", requiredPermission = false) + @GetResource(name = "获取系统配置字典类型详情", path = "/dictType/getConfigDictTypeDetail") public ResponseData getConfigDictTypeDetail(DictTypeRequest dictTypeRequest) { dictTypeRequest.setDictTypeCode(DictConstants.CONFIG_GROUP_DICT_TYPE_CODE); SysDictType detail = this.dictTypeService.detail(dictTypeRequest); @@ -137,7 +137,7 @@ public class DictTypeController { * @author fengshuonan * @since 2021/1/13 11:25 */ - @GetResource(name = "获取语种字典类型型详情", path = "/dictType/getTranslationDetail", requiredPermission = false) + @GetResource(name = "获取语种字典类型型详情", path = "/dictType/getTranslationDetail") public ResponseData getTranslationDetail(DictTypeRequest dictTypeRequest) { dictTypeRequest.setDictTypeCode(DictConstants.LANGUAGES_DICT_TYPE_CODE); SysDictType detail = this.dictTypeService.detail(dictTypeRequest); diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java index 6b011141b..bd9802491 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java @@ -25,7 +25,6 @@ package cn.stylefeng.roses.kernel.dict.modular.service; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -67,15 +66,6 @@ public interface DictTypeService extends IService { */ void edit(DictTypeRequest dictTypeRequest); - /** - * 修改字典状态 - * - * @param dictTypeRequest 字典类型请求 - * @author fengshuonan - * @since 2020/10/29 18:56 - */ - void editStatus(DictTypeRequest dictTypeRequest); - /** * 查询-详情-按实体对象 * @@ -95,14 +85,4 @@ public interface DictTypeService extends IService { */ List findList(DictTypeRequest dictTypeRequest); - /** - * 获取字典类型列表（带分页） - * - * @param dictTypeRequest 字典类型请求 - * @return 字典类型列表 - * @author fengshuonan - * @since 2020/10/29 18:55 - */ - PageResult findPage(DictTypeRequest dictTypeRequest); - } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java index c985f2059..8bd139848 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java @@ -27,9 +27,6 @@ package cn.stylefeng.roses.kernel.dict.modular.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; -import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; -import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.dict.api.enums.DictTypeClassEnum; import cn.stylefeng.roses.kernel.dict.api.exception.DictException; import cn.stylefeng.roses.kernel.dict.api.exception.enums.DictExceptionEnum; @@ -40,9 +37,7 @@ import cn.stylefeng.roses.kernel.dict.modular.service.DictService; import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService; import cn.stylefeng.roses.kernel.pinyin.api.PinYinApi; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; -import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; 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 org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -111,22 +106,9 @@ public class DictTypeServiceImpl extends ServiceImpl findPage(DictTypeRequest dictTypeRequest) { - Page page = this.page(PageFactory.defaultPage(), this.createWrapper(dictTypeRequest)); - return PageResultFactory.createPageResult(page); - } - /** * 校验dictTypeClass是否是系统字典，如果是系统字典只能超级管理员操作 * @@ -177,17 +153,13 @@ public class DictTypeServiceImpl extends ServiceImpl createWrapper(DictTypeRequest dictTypeRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Long dictTypeId = dictTypeRequest.getDictTypeId(); - String dictTypeCode = dictTypeRequest.getDictTypeCode(); - String dictTypeName = dictTypeRequest.getDictTypeName(); - - // SQL拼接 - queryWrapper.eq(ObjectUtil.isNotNull(dictTypeId), SysDictType::getDictTypeId, dictTypeId); - queryWrapper.eq(ObjectUtil.isNotNull(dictTypeCode), SysDictType::getDictTypeCode, dictTypeCode); - queryWrapper.like(ObjectUtil.isNotNull(dictTypeName), SysDictType::getDictTypeName, dictTypeName); - - // 查询未删除的 - queryWrapper.eq(SysDictType::getDelFlag, YesOrNotEnum.N.getCode()); + // 根据搜索的名称进行查询字典分类 + String searchText = dictTypeRequest.getSearchText(); + if (ObjectUtil.isNotEmpty(searchText)) { + queryWrapper.like(SysDictType::getDictTypeName, searchText); + queryWrapper.or().like(SysDictType::getDictTypeCode, searchText); + queryWrapper.or().like(SysDictType::getDictTypeNamePinyin, searchText); + } return queryWrapper; }