mirror of https://gitee.com/stylefeng/roses
【7.0.1】【log】增加日志结果的wrapper
parent
51f3867c32
commit
0c595a6cb0
|
@ -40,6 +40,22 @@
|
|||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--system的api-->
|
||||
<!--查询用户-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>system-api</artifactId>
|
||||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--包装器模块-->
|
||||
<!--包装结果-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>wrapper-api</artifactId>
|
||||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--数据库sdk-->
|
||||
<!--数据库dao框架-->
|
||||
<dependency>
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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<LogRecordDTO> {
|
|||
@Override
|
||||
public Map<String, Object> doWrap(LogRecordDTO beWrappedModel) {
|
||||
|
||||
if (beWrappedModel.getUserId() == null) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class);
|
||||
SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(beWrappedModel.getUserId());
|
||||
|
|
@ -24,22 +24,6 @@
|
|||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--system的api-->
|
||||
<!--查询用户-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>system-api</artifactId>
|
||||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--包装器模块-->
|
||||
<!--包装结果-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>wrapper-api</artifactId>
|
||||
<version>7.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<!--数据库sdk-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
|
|
|
@ -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<LogRecordDTO> findPage(LogManagerRequest logManagerRequest) {
|
||||
PageResult<SysLog> sysLogPageResult = this.sysLogService.findPage(logManagerRequest);
|
||||
|
||||
// 分页类型转换
|
||||
PageResult<LogRecordDTO> logRecordDTOPageResult = new PageResult<>();
|
||||
BeanUtil.copyProperties(sysLogPageResult, logRecordDTOPageResult);
|
||||
|
||||
// 转化数组
|
||||
List<SysLog> rows = sysLogPageResult.getRows();
|
||||
ArrayList<LogRecordDTO> newRows = new ArrayList<>();
|
||||
for (SysLog row : rows) {
|
||||
LogRecordDTO logRecordDTO = new LogRecordDTO();
|
||||
BeanUtil.copyProperties(row, logRecordDTO);
|
||||
newRows.add(logRecordDTO);
|
||||
}
|
||||
logRecordDTOPageResult.setRows(newRows);
|
||||
|
||||
return logRecordDTOPageResult;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue