Showing
3 changed files
with
6 additions
and
3 deletions
| @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; | @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; | ||
| 11 | */ | 11 | */ |
| 12 | @Data | 12 | @Data |
| 13 | public class OperationLogDto { | 13 | public class OperationLogDto { |
| 14 | - private String roomId; | 14 | + private String name; |
| 15 | private Integer page=1; | 15 | private Integer page=1; |
| 16 | private Integer size=10; | 16 | private Integer size=10; |
| 17 | } | 17 | } |
| @@ -39,7 +39,7 @@ public class OperationLog { | @@ -39,7 +39,7 @@ public class OperationLog { | ||
| 39 | /** 操作状态(0-成功 1-失败) */ | 39 | /** 操作状态(0-成功 1-失败) */ |
| 40 | private String status; | 40 | private String status; |
| 41 | /** 审片间名称 */ | 41 | /** 审片间名称 */ |
| 42 | - private String roomName; | 42 | + private String name; |
| 43 | /** 描述信息 */ | 43 | /** 描述信息 */ |
| 44 | private String message; | 44 | private String message; |
| 45 | 45 |
| @@ -9,6 +9,7 @@ import com.wondertek.mapper.OperationLogMapper; | @@ -9,6 +9,7 @@ import com.wondertek.mapper.OperationLogMapper; | ||
| 9 | import com.wondertek.service.OperationLogService; | 9 | import com.wondertek.service.OperationLogService; |
| 10 | import com.wondertek.util.PageBean; | 10 | import com.wondertek.util.PageBean; |
| 11 | import jakarta.annotation.Resource; | 11 | import jakarta.annotation.Resource; |
| 12 | +import org.apache.commons.lang3.StringUtils; | ||
| 12 | import org.springframework.stereotype.Service; | 13 | import org.springframework.stereotype.Service; |
| 13 | 14 | ||
| 14 | /** | 15 | /** |
| @@ -28,8 +29,10 @@ public class OperationLogServiceImpl implements OperationLogService { | @@ -28,8 +29,10 @@ public class OperationLogServiceImpl implements OperationLogService { | ||
| 28 | Integer size = operationLogDto.getSize(); | 29 | Integer size = operationLogDto.getSize(); |
| 29 | LambdaQueryWrapper<OperationLog> queryWrapper = new LambdaQueryWrapper<>(); | 30 | LambdaQueryWrapper<OperationLog> queryWrapper = new LambdaQueryWrapper<>(); |
| 30 | queryWrapper.eq(OperationLog::getBusinessType,"cloudMonitor") | 31 | queryWrapper.eq(OperationLog::getBusinessType,"cloudMonitor") |
| 31 | - .eq(OperationLog::getBusinessId,operationLogDto.getRoomId()) | ||
| 32 | .orderByDesc(OperationLog::getCreatedTime); | 32 | .orderByDesc(OperationLog::getCreatedTime); |
| 33 | + if (StringUtils.isNoneEmpty(operationLogDto.getName())){ | ||
| 34 | + queryWrapper.like(OperationLog::getName,operationLogDto.getName()); | ||
| 35 | + } | ||
| 33 | Page<OperationLog> pageInfo = new Page<>(page, size); | 36 | Page<OperationLog> pageInfo = new Page<>(page, size); |
| 34 | IPage<OperationLog> resultPage = operationLogMapper.selectPage(pageInfo, queryWrapper); | 37 | IPage<OperationLog> resultPage = operationLogMapper.selectPage(pageInfo, queryWrapper); |
| 35 | return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),resultPage.getRecords()); | 38 | return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),resultPage.getRecords()); |
-
Please register or login to post a comment