Skip to content

Commit a8942e6

Browse files
committed
feat: log列表支持时间范围过滤
1 parent f08bbce commit a8942e6

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

application/src/main/java/top/cadecode/uniboot/controller/system/SysLogController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public PageResult<SysLogPageVo> page(@RequestBody @Valid SysLogPageRequest reque
4747
.setEntity(SysLog.builder()
4848
.exceptional(request.getExceptional())
4949
.build())
50-
.eq(ObjectUtil.isNotEmpty(request.getCreateTime()), SysLog::getCreateTime, request.getCreateTime())
50+
.ge(ObjectUtil.isNotEmpty(request.getStartTime()), SysLog::getCreateTime, request.getStartTime())
51+
.le(ObjectUtil.isNotEmpty(request.getEndTime()), SysLog::getCreateTime, request.getEndTime())
5152
.in(ObjectUtil.isNotEmpty(request.getLogTypeList()), SysLog::getLogType, request.getLogTypeList())
5253
.likeRight(ObjectUtil.isNotEmpty(request.getAccessUser()), SysLog::getAccessUser, request.getAccessUser())
5354
.like(ObjectUtil.isNotEmpty(request.getUrl()), SysLog::getUrl, request.getUrl())
@@ -57,7 +58,7 @@ public PageResult<SysLogPageVo> page(@RequestBody @Valid SysLogPageRequest reque
5758
return new PageResult<>((int) page.getTotal(), voList);
5859
}
5960

60-
@ApiOperation("查询列表")
61+
@ApiOperation("删除")
6162
@PostMapping("delete")
6263
public boolean delete(@RequestBody @NotEmpty List<Long> idList) {
6364
return logService.removeBatchByIds(idList);

system/src/main/java/top/cadecode/uniboot/system/request/SysLogRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public class SysLogRequest {
1818
@Data
1919
public static class SysLogPageRequest extends PageParams {
2020

21-
private Date createTime;
21+
private Date startTime;
22+
private Date endTime;
2223
private List<LogTypeEnum> logTypeList;
2324
private String url;
2425
private String accessUser;

0 commit comments

Comments
 (0)