From 2fcc50f653eba2cd001f93bf298b7c893229e2f3 Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Sun, 11 Aug 2024 14:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=A8=E9=80=81=E5=BE=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResourceController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java index 05a374f..d3b920c 100644 --- a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java +++ b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java @@ -1,5 +1,7 @@ package com.muyu.resource.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; @@ -38,7 +40,7 @@ public class ResourceController { @Log(title = "用户管理", businessType = BusinessType.IMPORT) @RequiresPermissions("Resource:ResourceInfo:import") @PostMapping("/importData") - public Result importData (@RequestParam("file") MultipartFile file) throws Exception { + public Result importData (@RequestParam("file") MultipartFile file,int pageNum,int pageSize) throws Exception { String originalFilename = file.getOriginalFilename(); @@ -51,10 +53,24 @@ public class ResourceController { List resourceInfoList = util.importExcel(file.getInputStream()); + PageHelper.startPage(pageNum,pageSize); + + + PageInfo pageInfo = new PageInfo<>(resourceInfoList); // String operName = SecurityUtils.getUsername(); // String message = resourceService.importResource(resourceList, updateSupport, operName); - return Result.success(resourceInfoList); + return Result.success(pageInfo); + + } + + + @PostMapping + public void ChaChong(){ + + + + }