【7.6.0】【dict type】删除没有用到的业务方法

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<SysDictType> 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<SysDictType>> 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<SysDictType> 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<SysDictType> getTranslationDetail(DictTypeRequest dictTypeRequest) {
         dictTypeRequest.setDictTypeCode(DictConstants.LANGUAGES_DICT_TYPE_CODE);
         SysDictType detail = this.dictTypeService.detail(dictTypeRequest);

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<SysDictType> {
      */
     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<SysDictType> {
      */
     List<SysDictType> findList(DictTypeRequest dictTypeRequest);
 
-    /**
-     * 获取字典类型列表（带分页）
-     *
-     * @param dictTypeRequest 字典类型请求
-     * @return 字典类型列表
-     * @author fengshuonan
-     * @since 2020/10/29 18:55
-     */
-    PageResult<SysDictType> findPage(DictTypeRequest dictTypeRequest);
-
 }

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<DictTypeMapper, SysDictType
         this.updateById(sysDictType);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void editStatus(DictTypeRequest dictTypeRequest) {
-
-        // 如果是系统级字典，只允许管理员操作
-        validateSystemTypeClassOperate(dictTypeRequest);
-
-        // 更新数据
-        SysDictType oldSysDictType = this.querySysDictType(dictTypeRequest);
-        oldSysDictType.setStatusFlag(dictTypeRequest.getStatusFlag());
-        this.updateById(oldSysDictType);
-    }
-
     @Override
     public SysDictType detail(DictTypeRequest dictTypeRequest) {
-        return this.getOne(this.createWrapper(dictTypeRequest), false);
+        return this.querySysDictType(dictTypeRequest);
     }
 
     @Override
@@ -134,12 +116,6 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, SysDictType
         return this.list(this.createWrapper(dictTypeRequest));
     }
 
-    @Override
-    public PageResult<SysDictType> findPage(DictTypeRequest dictTypeRequest) {
-        Page<SysDictType> page = this.page(PageFactory.defaultPage(), this.createWrapper(dictTypeRequest));
-        return PageResultFactory.createPageResult(page);
-    }
-
     /**
      * 校验dictTypeClass是否是系统字典，如果是系统字典只能超级管理员操作
      *
@@ -177,17 +153,13 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, SysDictType
     private LambdaQueryWrapper<SysDictType> createWrapper(DictTypeRequest dictTypeRequest) {
         LambdaQueryWrapper<SysDictType> 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;
     }