From 9b67d68d89117dad08e46fe184ebe5a224c96588 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 29 Aug 2022 22:16:00 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=A5=E5=BF=97api=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/controller/sys/SysLogController.java | 6 +++--- .../dataease/controller/sys/SysUserController.java | 8 ++++---- .../{UserGridRequest.java => KeyGridRequest.java} | 2 +- .../main/java/io/dataease/ext/ExtSysLogMapper.xml | 12 +++++++++++- .../io/dataease/service/sys/SysUserService.java | 2 +- .../io/dataease/service/sys/log/LogService.java | 13 ++++++++----- 6 files changed, 28 insertions(+), 15 deletions(-) rename backend/src/main/java/io/dataease/controller/sys/request/{UserGridRequest.java => KeyGridRequest.java} (77%) diff --git a/backend/src/main/java/io/dataease/controller/sys/SysLogController.java b/backend/src/main/java/io/dataease/controller/sys/SysLogController.java index 784a7c0ae1..f8e5eb3418 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysLogController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysLogController.java @@ -6,7 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.handler.annotation.I18n; -import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.controller.sys.request.KeyGridRequest; import io.dataease.dto.SysLogGridDTO; import io.dataease.dto.log.FolderItem; import io.dataease.service.sys.log.LogService; @@ -37,7 +37,7 @@ public class SysLogController { @ApiImplicitParam(name = "request", value = "查询条件", required = true) }) public Pager> logGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody BaseGridRequest request) { + @RequestBody KeyGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, logService.query(request)); } @@ -51,7 +51,7 @@ public class SysLogController { @ApiOperation("导出操作日志") @PostMapping("/export") @ApiImplicitParam(name = "request", value = "查询条件", required = true) - public void export(@RequestBody BaseGridRequest request) throws Exception{ + public void export(@RequestBody KeyGridRequest request) throws Exception{ logService.exportExcel(request); } } diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index b161131bcb..098834c39e 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -7,7 +7,7 @@ import io.dataease.auth.annotation.DeLog; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.utils.BeanUtils; -import io.dataease.controller.sys.request.UserGridRequest; +import io.dataease.controller.sys.request.KeyGridRequest; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.SysRole; @@ -60,7 +60,7 @@ public class SysUserController { @ApiImplicitParam(name = "request", value = "查询条件", required = true) }) public Pager> userGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody UserGridRequest request) { + @RequestBody KeyGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, sysUserService.query(request)); } @@ -68,8 +68,8 @@ public class SysUserController { @ApiIgnore @PostMapping("/userLists") public List userLists(@RequestBody BaseGridRequest request) { - UserGridRequest userGridRequest = BeanUtils.copyBean(new UserGridRequest(), request); - return sysUserService.query(userGridRequest); + KeyGridRequest keyGridRequest = BeanUtils.copyBean(new KeyGridRequest(), request); + return sysUserService.query(keyGridRequest); } @ApiOperation("创建用户") diff --git a/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java similarity index 77% rename from backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java rename to backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java index 029b889972..42af480232 100644 --- a/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java +++ b/backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java @@ -7,7 +7,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class UserGridRequest extends BaseGridRequest implements Serializable { +public class KeyGridRequest extends BaseGridRequest implements Serializable { @ApiModelProperty("关键字") private String keyWord; } diff --git a/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml b/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml index ee20d82d7f..362c56f7ba 100644 --- a/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml @@ -8,7 +8,17 @@