diff --git a/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java index 7f004163..a1390bc1 100644 --- a/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; /** * 操作日志 @@ -28,8 +29,8 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( - getPage(params, Constant.CREATE_DATE, false), - getWrapper(params) + getPage(params, Constant.CREATE_DATE, false), + getWrapper(params) ); return getPageData(page, SysLogOperationDTO.class); @@ -42,7 +43,7 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl getWrapper(Map params){ + private QueryWrapper getWrapper(Map params) { String status = (String) params.get("status"); QueryWrapper wrapper = new QueryWrapper<>(); @@ -54,7 +55,9 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl { + insert(entity); + }); } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 91324236..7353e579 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -210,7 +210,7 @@ public class ResourceController { @ApiOperation("导入") @LogOperation("导入") @ApiImplicitParams({ - @ApiImplicitParam(name = "source", value = "请求来源", paramType = "string", dataType = "string") + @ApiImplicitParam(name = "file", value = "数据文件文件", paramType = "file", dataType = "file") }) public Result importResource(@RequestParam("file") MultipartFile uploadFile, HttpServletRequest request) { List> dept =