From 5a1334b165f66927ddd954b89fa2609a0f074503 Mon Sep 17 00:00:00 2001 From: aikai Date: Tue, 16 Apr 2024 15:28:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E4=B8=80=E7=AF=87?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=AF=87=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/worklog/LogInstanceController.java | 15 ++++++++++++--- .../dal/mysql/worklog/LogInstanceMapper.java | 18 +++++++++++++----- .../service/worklog/LogInstanceService.java | 8 ++++++++ .../worklog/LogInstanceServiceImpl.java | 6 ++++++ .../mapper/worklog/LogInstanceMapper.xml | 19 +++++++++++++++++++ 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java index a66a88d4..d1a7794e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java @@ -87,6 +87,15 @@ public class LogInstanceController { return success(logInstance); } + + @GetMapping("/getNextOrUp") + @Operation(summary = "获取上一篇下一篇日志") + public CommonResult getNextOrUp(@Parameter(description = "当前id") @RequestParam("id") Long id, + @Parameter(description = "类型 0上一篇 1下一篇") @RequestParam("type") Integer type) { + Long lastId = logInstanceService.getNextOrUp(id, type); + return success(lastId); + } + @GetMapping("/page") @Operation(summary = "获得日志分页列表") @PreAuthorize("@ss.hasPermission('system:view-log:query')") @@ -159,11 +168,11 @@ public class LogInstanceController { @PreAuthorize("@ss.hasPermission('system:log-instance:export')") @OperateLog(type = EXPORT) public void exportLogInstanceExcel(@Valid LogInstancePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = logInstanceService.getLogInstancePage(pageReqVO,null).getRecords(); + List list = logInstanceService.getLogInstancePage(pageReqVO, null).getRecords(); // 导出 Excel ExcelUtils.write(response, "日志实例的拓展.xls", "数据", LogInstanceRespVO.class, - BeanUtils.toBean(list, LogInstanceRespVO.class)); + BeanUtils.toBean(list, LogInstanceRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java index 051099ca..a83fc95d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** @@ -39,12 +38,21 @@ public interface LogInstanceMapper extends BaseMapperX { .in(LogInstanceDO::getTime, dateList)); } - IPage selectPageResult(@Param("page")Page page, @Param("reqVO")LogInstancePageReqVO reqVO, - @Param("userId")Long userId, @Param("pagingType") Integer pagingType, @Param("logId")Long logId); + IPage selectPageResult(@Param("page") Page page, @Param("reqVO") LogInstancePageReqVO reqVO, + @Param("userId") Long userId, @Param("pagingType") Integer pagingType, @Param("logId") Long logId); - LogInstanceRespVO selectPageResult(@Param("reqVO")LogInstancePageReqVO reqVO, @Param("userId")Long userId, - @Param("pagingType") Integer pagingType, @Param("logId")Long logId); + LogInstanceRespVO selectPageResult(@Param("reqVO") LogInstancePageReqVO reqVO, @Param("userId") Long userId, + @Param("pagingType") Integer pagingType, @Param("logId") Long logId); List selectRaedUser(Long deptId); + /** + * 获取上一篇下一篇 + * + * @param id + * @param userId + * @param type + * @return + */ + Long getNextOrUp(@Param("id") Long id, @Param("userId") Long userId, @Param("type") Integer type); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java index ca15f451..0cc7d83f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java @@ -84,4 +84,12 @@ public interface LogInstanceService { * 设置日志详情 模板内容和时间 */ LogInstanceRespVO setContentFun(LogInstanceRespVO logInstanceRespVO); + + /** + * 获取上一篇 下一篇 + * @param id + * @param type + * @return + */ + Long getNextOrUp(Long id, Integer type); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java index ab6867ac..a6e1f742 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java @@ -336,6 +336,12 @@ public class LogInstanceServiceImpl implements LogInstanceService { return logInstanceRespVO; } + @Override + public Long getNextOrUp(Long id, Integer type) { + //获取日志详情 + return logInstanceMapper.getNextOrUp(id, getLoginUserId(), type); + } + @Override public List getNeedWriteLogInstanceByTimeRange(Long fromId, List time, Long userId) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml index d4d24127..f8676693 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml @@ -130,4 +130,23 @@ GROUP BY a.id, readStatus, readCount, unReadCount, comment ORDER BY a.create_time DESC + + \ No newline at end of file