diff --git a/src/main/java/org/springblade/modules/system/controller/LogApiController.java b/src/main/java/org/springblade/modules/system/controller/LogApiController.java index ce53324..4cba24f 100644 --- a/src/main/java/org/springblade/modules/system/controller/LogApiController.java +++ b/src/main/java/org/springblade/modules/system/controller/LogApiController.java @@ -14,6 +14,7 @@ import org.springblade.core.tool.utils.WebUtil; import org.springblade.modules.system.dto.LogDTO; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.service.ILogApiService; +import org.springblade.modules.system.vo.LogRecord; import org.springblade.modules.system.vo.LogVO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -61,11 +62,11 @@ public class LogApiController { * 查询多条(分页) */ @GetMapping("/logOnList") - public R>> logOnList(@ApiIgnore LogDTO log, Query query) { + public R> logOnList(@ApiIgnore LogDTO log, Query query) { // HttpServletRequest request = WebUtil.getRequest(); User user = UserCache.getUser("", ""); Map> logList = logService.logOnList(log); - return R.data(logList); + return R.data(null); } } diff --git a/src/main/java/org/springblade/modules/system/vo/LogRecord.java b/src/main/java/org/springblade/modules/system/vo/LogRecord.java new file mode 100644 index 0000000..4406378 --- /dev/null +++ b/src/main/java/org/springblade/modules/system/vo/LogRecord.java @@ -0,0 +1,21 @@ + +package org.springblade.modules.system.vo; + +import lombok.Data; + +import java.util.List; + +/** + * 数据传输对象实体类 + * + * @author Chill + */ +@Data +public class LogRecord { + private static final long serialVersionUID = 1L; + + private String time; + + private List logs; + +}