diff --git a/kernel-d-log/log-business-manage/pom.xml b/kernel-d-log/log-business-manage/pom.xml
index c729aacaa..1efa0a5c8 100644
--- a/kernel-d-log/log-business-manage/pom.xml
+++ b/kernel-d-log/log-business-manage/pom.xml
@@ -40,6 +40,22 @@
7.0.1
+
+
+
+ cn.stylefeng.roses
+ system-api
+ 7.0.1
+
+
+
+
+
+ cn.stylefeng.roses
+ wrapper-api
+ 7.0.1
+
+
diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java
index 0f53c1c42..92898e425 100644
--- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java
+++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java
@@ -3,11 +3,13 @@ package cn.stylefeng.roses.kernel.log.manage;
import cn.stylefeng.roses.kernel.log.api.LogManagerApi;
import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest;
import cn.stylefeng.roses.kernel.log.db.service.SysLogService;
+import cn.stylefeng.roses.kernel.log.manage.wrapper.LogInfoWrapper;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
+import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -54,6 +56,7 @@ public class LogManagerController {
* @date 2021/1/8 17:36
*/
@GetResource(name = "查询日志列表", path = "/logManager/page")
+ @Wrapper(LogInfoWrapper.class)
public ResponseData page(LogManagerRequest logManagerRequest) {
return new SuccessResponseData(logManagerApi.findPage(logManagerRequest));
}
diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/wrapper/LogInfoWrapper.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/wrapper/LogInfoWrapper.java
similarity index 85%
rename from kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/wrapper/LogInfoWrapper.java
rename to kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/wrapper/LogInfoWrapper.java
index e41237f51..3809d1c00 100644
--- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/wrapper/LogInfoWrapper.java
+++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/wrapper/LogInfoWrapper.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.log.db.wrapper;
+package cn.stylefeng.roses.kernel.log.manage.wrapper;
import cn.hutool.extra.spring.SpringUtil;
import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO;
@@ -20,6 +20,9 @@ public class LogInfoWrapper implements BaseWrapper {
@Override
public Map doWrap(LogRecordDTO beWrappedModel) {
+ if (beWrappedModel.getUserId() == null) {
+ return new HashMap<>();
+ }
UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class);
SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getUserId());
diff --git a/kernel-d-log/log-sdk-db/pom.xml b/kernel-d-log/log-sdk-db/pom.xml
index d635ae44a..2c75d598d 100644
--- a/kernel-d-log/log-sdk-db/pom.xml
+++ b/kernel-d-log/log-sdk-db/pom.xml
@@ -24,22 +24,6 @@
7.0.1
-
-
-
- cn.stylefeng.roses
- system-api
- 7.0.1
-
-
-
-
-
- cn.stylefeng.roses
- wrapper-api
- 7.0.1
-
-
cn.stylefeng.roses
diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java
index b4a730822..96db5a115 100644
--- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java
+++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java
@@ -8,11 +8,10 @@ import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest;
import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO;
import cn.stylefeng.roses.kernel.log.db.entity.SysLog;
import cn.stylefeng.roses.kernel.log.db.service.SysLogService;
-import cn.stylefeng.roses.kernel.log.db.wrapper.LogInfoWrapper;
-import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -36,13 +35,23 @@ public class DbLogManagerServiceImpl implements LogManagerApi {
}
@Override
- @Wrapper(LogInfoWrapper.class)
public PageResult findPage(LogManagerRequest logManagerRequest) {
PageResult sysLogPageResult = this.sysLogService.findPage(logManagerRequest);
// 分页类型转换
PageResult logRecordDTOPageResult = new PageResult<>();
BeanUtil.copyProperties(sysLogPageResult, logRecordDTOPageResult);
+
+ // 转化数组
+ List rows = sysLogPageResult.getRows();
+ ArrayList newRows = new ArrayList<>();
+ for (SysLog row : rows) {
+ LogRecordDTO logRecordDTO = new LogRecordDTO();
+ BeanUtil.copyProperties(row, logRecordDTO);
+ newRows.add(logRecordDTO);
+ }
+ logRecordDTOPageResult.setRows(newRows);
+
return logRecordDTOPageResult;
}