diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/system/controller/SysDictController.java index 76cb83ec..d1137cf4 100644 --- a/src/main/java/com/youlai/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/system/controller/SysDictController.java @@ -5,10 +5,10 @@ import com.youlai.system.common.model.Option; import com.youlai.system.common.result.PageResult; import com.youlai.system.common.result.Result; import com.youlai.system.enums.LogModuleEnum; +import com.youlai.system.model.query.DictPageQuery; import com.youlai.system.model.vo.DictPageVO; import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit; import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.query.DictTypePageQuery; import com.youlai.system.plugin.syslog.annotation.LogAnnotation; import com.youlai.system.service.SysDictService; import io.swagger.v3.oas.annotations.Parameter; @@ -38,7 +38,7 @@ public class SysDictController { @GetMapping("/page") @LogAnnotation( value = "字典分页列表",module = LogModuleEnum.DICT) public PageResult getDictPage( - DictTypePageQuery queryParams + DictPageQuery queryParams ) { Page result = dictService.getDictPage(queryParams); return PageResult.success(result); diff --git a/src/main/java/com/youlai/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/system/mapper/SysDictMapper.java index 2344afa8..2565b95c 100644 --- a/src/main/java/com/youlai/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysDictMapper.java @@ -3,7 +3,7 @@ package com.youlai.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.model.entity.SysDict; -import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.query.DictPageQuery; import com.youlai.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; @@ -23,7 +23,7 @@ public interface SysDictMapper extends BaseMapper { * @param queryParams 查询参数 * @return */ - Page getDictPage(Page page, DictTypePageQuery queryParams); + Page getDictPage(Page page, DictPageQuery queryParams); } diff --git a/src/main/java/com/youlai/system/model/query/DictTypePageQuery.java b/src/main/java/com/youlai/system/model/query/DictTypePageQuery.java deleted file mode 100644 index 9d2a7860..00000000 --- a/src/main/java/com/youlai/system/model/query/DictTypePageQuery.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.youlai.system.model.query; - - -import com.youlai.system.common.base.BasePageQuery; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description ="字典分页查询对象") -@Data -public class DictTypePageQuery extends BasePageQuery { - - @Schema(description="关键字(类型名称/类型编码)") - private String keywords; - -} diff --git a/src/main/java/com/youlai/system/service/SysDictItemService.java b/src/main/java/com/youlai/system/service/SysDictItemService.java index 1a040425..44698490 100644 --- a/src/main/java/com/youlai/system/service/SysDictItemService.java +++ b/src/main/java/com/youlai/system/service/SysDictItemService.java @@ -11,10 +11,4 @@ import com.youlai.system.model.entity.SysDictItem; */ public interface SysDictItemService extends IService { - /** - * 根据字典ID删除字典项 - * - * @param dictId 字典ID - */ - void removeByDictId(Long dictId); } diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java index 40984b3b..a1ffad2d 100644 --- a/src/main/java/com/youlai/system/service/SysDictService.java +++ b/src/main/java/com/youlai/system/service/SysDictService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.system.common.model.Option; import com.youlai.system.model.entity.SysDict; import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.query.DictPageQuery; import com.youlai.system.model.vo.DictPageVO; import java.util.List; @@ -24,7 +24,7 @@ public interface SysDictService extends IService { * @param queryParams 分页查询对象 * @return */ - Page getDictPage(DictTypePageQuery queryParams); + Page getDictPage(DictPageQuery queryParams); /** diff --git a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java index df9518c1..f134999f 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java @@ -17,15 +17,6 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class SysDictItemServiceImpl extends ServiceImpl implements SysDictItemService { - /** - * 根据字典ID删除字典项 - * - * @param dictId 字典ID - */ - @Override - public void removeByDictId(Long dictId) { - - } } diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java index f770a8f3..d7a459a7 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java @@ -14,7 +14,7 @@ import com.youlai.system.model.entity.SysDictItem; import com.youlai.system.common.model.Option; import com.youlai.system.mapper.SysDictMapper; import com.youlai.system.model.form.DictForm; -import com.youlai.system.model.query.DictTypePageQuery; +import com.youlai.system.model.query.DictPageQuery; import com.youlai.system.model.vo.DictPageVO; import com.youlai.system.service.SysDictItemService; import com.youlai.system.service.SysDictService; @@ -45,7 +45,7 @@ public class SysDictServiceImpl extends ServiceImpl impl * @param queryParams 分页查询对象 */ @Override - public Page getDictPage(DictTypePageQuery queryParams) { + public Page getDictPage(DictPageQuery queryParams) { // 查询参数 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize();