zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

V0.5.x
jay 2023-05-30 08:28:56 +08:00
parent a77ebf68a3
commit a7c767542a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java
View File

@ -9,6 +9,7 @@
*/ */
package cc.iotkit.manager.controller; package cc.iotkit.manager.controller;
import cc.iotkit.common.api.PageRequest;
import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.enums.ErrCode;
import cc.iotkit.common.exception.BizException; import cc.iotkit.common.exception.BizException;
import cc.iotkit.common.satoken.utils.AuthUtil; import cc.iotkit.common.satoken.utils.AuthUtil;
@ -20,6 +21,7 @@ import cc.iotkit.data.manager.IThingModelData;
import cc.iotkit.manager.config.AliyunConfig; import cc.iotkit.manager.config.AliyunConfig;
import cc.iotkit.manager.service.DataOwnerService; import cc.iotkit.manager.service.DataOwnerService;
import cc.iotkit.common.api.Paging; import cc.iotkit.common.api.Paging;
import cc.iotkit.model.alert.AlertConfig;
import cc.iotkit.model.product.Category; import cc.iotkit.model.product.Category;
import cc.iotkit.model.product.Product; import cc.iotkit.model.product.Product;
import cc.iotkit.model.product.ProductModel; import cc.iotkit.model.product.ProductModel;
@ -34,9 +36,11 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -68,15 +72,14 @@ public class ProductController {
private OSS ossClient; private OSS ossClient;
@PostMapping("/list/{size}/{page}") @PostMapping("/list")
public Paging<Product> getProducts( public Paging<Product> getProducts(
@PathVariable("size") int size, PageRequest<Product> request) {
@PathVariable("page") int page) {
if (!AuthUtil.isAdmin()) { if (!AuthUtil.isAdmin()) {
return productData.findByUid(AuthUtil.getUserId(), page, size); return productData.findByUid(AuthUtil.getUserId(), request.getPageNum(), request.getPageSize());
} }
return productData.findAll(page, size); return productData.findAll(request);
} }
@PostMapping("/save") @PostMapping("/save")