资源推送微服务
parent
1e382a6ea4
commit
2fcc50f653
|
@ -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<ResourceInfo> resourceInfoList = util.importExcel(file.getInputStream());
|
||||
|
||||
PageHelper.startPage(pageNum,pageSize);
|
||||
|
||||
|
||||
PageInfo<ResourceInfo> 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(){
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue