From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 22 四月 2025 17:55:30 +0800 Subject: [PATCH] 11.6 --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java index 7dfe7aa..2d3d346 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.admin.entity.RecoveryClassify; import com.ruoyi.admin.service.RecoveryClassifyService; +import com.ruoyi.admin.service.SiteService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.annotation.RequiresPermissions; import io.swagger.annotations.Api; @@ -34,6 +35,7 @@ @Resource private RecoveryClassifyService recoveryClassifyService; + /** * 回收分类分页列表 * @@ -56,12 +58,24 @@ .page(Page.of(pageNum, pageSize))); } + + @ApiOperation(value = "分类下拉框", tags = {"后台-下拉框"}) + @GetMapping(value = "/select") + + public R<List<RecoveryClassify>> select(String className) { + return R.ok(recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getIsDelete, 0) + .orderByDesc(RecoveryClassify::getSupClassify).like(className!=null&&className!="", RecoveryClassify::getSubClassify,className) + .orderByAsc(RecoveryClassify::getSort) + .orderByDesc(RecoveryClassify::getCreateTime) + .list()); + } + /** * 回收分类详情 * * @param id 回收分类id */ - @RequiresPermissions("serve_recycling_classification") + @RequiresPermissions("classification_detail") @ApiOperation(value = "回收分类详情", tags = {"后台-回收管理-回收分类管理"}) @GetMapping(value = "/detail") @ApiImplicitParams({ @@ -74,7 +88,7 @@ /** * 是否首页推荐 */ - @RequiresPermissions("serve_recycling_classification") + @RequiresPermissions("classification_recommend") @ApiOperation(value = "是否首页推荐", tags = {"后台-回收管理-回收分类管理"}) @GetMapping(value = "/recommend") @ApiImplicitParams({ @@ -96,7 +110,7 @@ * * @param recoveryClassify 回收分类信息 */ - @RequiresPermissions("serve_recycling_classification") + @RequiresPermissions("classification_save") @ApiOperation(value = "新增回收分类", tags = {"后台-回收管理-回收分类管理"}) @PostMapping(value = "/save") public R<String> save(@RequestBody RecoveryClassify recoveryClassify) { @@ -108,7 +122,7 @@ * * @param recoveryClassify 回收分类信息 */ - @RequiresPermissions("serve_recycling_classification") + @RequiresPermissions("classification_update") @ApiOperation(value = "修改回收分类", tags = {"后台-回收管理-回收分类管理"}) @PostMapping(value = "/update") public R<String> update(@RequestBody RecoveryClassify recoveryClassify) { @@ -120,7 +134,7 @@ * * @param ids 回收分类多条id拼接 */ - @RequiresPermissions("serve_recycling_classification") + @RequiresPermissions("classification_delete") @ApiOperation(value = "批量删除回收分类", tags = {"后台-回收管理-回收分类管理"}) @GetMapping(value = "/batchDelete") @ApiImplicitParams({ -- Gitblit v1.7.1