From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryClassifyController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 5145977..ec71c98 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
@@ -6,6 +6,7 @@
import com.ruoyi.admin.entity.RecoveryClassify;
import com.ruoyi.admin.service.RecoveryClassifyService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -39,6 +40,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("serve_recycling_classification")
@ApiOperation(value = "回收分类分页查询列表", tags = {"后台-回收管理-回收分类管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -48,7 +50,10 @@
public R<IPage<RecoveryClassify>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return R.ok(recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getIsDelete, 0)
- .orderByDesc(RecoveryClassify::getCreateTime).page(Page.of(pageNum, pageSize)));
+ .orderByDesc(RecoveryClassify::getSupClassify)
+ .orderByAsc(RecoveryClassify::getSort)
+ .orderByDesc(RecoveryClassify::getCreateTime)
+ .page(Page.of(pageNum, pageSize)));
}
/**
@@ -56,6 +61,7 @@
*
* @param id 回收分类id
*/
+ @RequiresPermissions("classification_detail")
@ApiOperation(value = "回收分类详情", tags = {"后台-回收管理-回收分类管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -66,10 +72,31 @@
}
/**
+ * 是否首页推荐
+ */
+ @RequiresPermissions("classification_recommend")
+ @ApiOperation(value = "是否首页推荐", tags = {"后台-回收管理-回收分类管理"})
+ @GetMapping(value = "/recommend")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "分类id", name = "id", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "是否推荐 0未推荐;1已推荐", name = "recommend", dataType = "Integer", required = true)
+ })
+ public R<String> recommend(@RequestParam Integer id, @RequestParam Integer recommend) {
+ Integer[] arr = {0, 1};
+ boolean contains = Arrays.stream(arr).collect(Collectors.toList()).contains(recommend);
+ if (!contains) {
+ return R.fail("推荐状态异常！");
+ }
+ return recoveryClassifyService.lambdaUpdate().set(RecoveryClassify::getIsRecommend, recommend)
+ .eq(RecoveryClassify::getId, id).update() ? R.ok() : R.fail();
+ }
+
+ /**
* 新增回收分类
*
* @param recoveryClassify 回收分类信息
*/
+ @RequiresPermissions("classification_save")
@ApiOperation(value = "新增回收分类", tags = {"后台-回收管理-回收分类管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody RecoveryClassify recoveryClassify) {
@@ -81,6 +108,7 @@
*
* @param recoveryClassify 回收分类信息
*/
+ @RequiresPermissions("classification_update")
@ApiOperation(value = "修改回收分类", tags = {"后台-回收管理-回收分类管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody RecoveryClassify recoveryClassify) {
@@ -92,6 +120,7 @@
*
* @param ids 回收分类多条id拼接
*/
+ @RequiresPermissions("classification_delete")
@ApiOperation(value = "批量删除回收分类", tags = {"后台-回收管理-回收分类管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
--
Gitblit v1.7.1