From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
index 2dd0278..a840d1a 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java
@@ -1,5 +1,6 @@
package com.oying.modules.pc.category.rest;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.annotation.Log;
import com.oying.modules.pc.category.converter.PlatformCategoryViewAssembler;
@@ -9,13 +10,14 @@
import com.oying.modules.pc.category.domain.dto.PlatformCategoryUpdateDto;
import com.oying.modules.pc.category.domain.dto.PlatformCategoryUpdateRequest;
import com.oying.modules.pc.category.service.PlatformCategoryService;
-import com.oying.modules.pc.category.view.PlatformCategoryView;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.modules.pc.category.view.PlatformCategoryAdminView;
+import com.oying.utils.R;
import com.oying.utils.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -41,14 +43,14 @@
private final PlatformCategoryService categoryService;
private final PlatformCategoryViewAssembler assembler;
- @GetMapping
+ @GetMapping(value = "/list")
@ApiOperation("查询平台类目(支持分页)")
- @PreAuthorize("@el.check('admin:platformCategory:list')")
+ //@PreAuthorize("@el.check('admin:platformCategory:list')")
public ResponseEntity<?> queryPlatformCategory(PlatformCategoryQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<PlatformCategory> pageResult = categoryService.queryAll(criteria, page);
- List<PlatformCategoryView> responseList = Optional.ofNullable(pageResult.getContent()).orElse(new ArrayList<>()).stream().map(assembler::toPlatformCategoryResponse).collect(Collectors.toList());
- PageResult<PlatformCategoryView> responsePageResult = new PageResult<>(responseList, pageResult.getTotalElements());
+ List<PlatformCategoryAdminView> responseList = Optional.ofNullable(pageResult.getContent()).orElse(new ArrayList<>()).stream().map(assembler::toPlatformCategoryResponse).collect(Collectors.toList());
+ PageResult<PlatformCategoryAdminView> responsePageResult = new PageResult<>(responseList, pageResult.getTotalElements());
return ResponseEntity.ok(R.success(responsePageResult));
}
@@ -60,14 +62,14 @@
return ResponseEntity.status(HttpStatus.CREATED).build();
}
- @PutMapping("/{categoryId}")
+ @PutMapping(value = "/{categoryId}")
@ApiOperation("修改平台类目")
//@PreAuthorize("@el.check('admin:platformCategory:updateById')")
public ResponseEntity<?> updateById(@PathVariable Long categoryId,
@Validated @RequestBody PlatformCategoryUpdateRequest request) {
+ request.setCategoryId(ObjectUtils.defaultIfNull(request.getCategoryId(), categoryId));
PlatformCategoryUpdateDto updateDto = new PlatformCategoryUpdateDto();
BeanUtils.copyProperties(request, updateDto);
- updateDto.setCategoryId(categoryId);
categoryService.update(updateDto);
return ResponseEntity.noContent().build();
}
--
Gitblit v1.9.3