ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志模块

Browse Source
This commit is contained in:
furongxin 2024-04-12 21:57:05 +08:00
parent acda782e6e
commit b58bc365af
6 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
View File

@ -85,6 +85,7 @@ public class LogInstanceController {
@Operation(summary = "获得我收到的日志分页列表")
@PreAuthorize("@ss.hasPermission('system:view-log:query')")
public CommonResult<PageResult<LogInstanceRespVO>> getLogInstancePage(@Valid LogInstancePageReqVO pageReqVO) {
PageResult<LogInstanceDO> pageResult = logInstanceService.getLogInstancePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, LogInstanceRespVO.class));
}

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -48,4 +47,12 @@ public class LogInstancePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "其他数据")
private OtherData data;
private static class OtherData{
private List<Long> deptIds;
}
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java
View File

@ -40,6 +40,11 @@ public class LogReadDo extends BaseDO {
*/
private Long readUserId;
/**
* 日志查看人的部门编号
*/
private Long readUserDept;
/**
* 日志查看状态
* 0：未读

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogReadServiceImpl.java
View File

@ -30,6 +30,7 @@ public class LogReadServiceImpl implements LogReadService{
LogReadDo logReadDo = new LogReadDo();
logReadDo.setLogInstanceId(logInstanceId);
logReadDo.setStartUserId(startUserId);
logReadDo.setReadUserDept(user.getDeptId());
logReadDo.setReadUserId(user.getUserId());
logReadDo.setReadStatus(0);
return logReadDo;

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java
View File

@ -13,4 +13,9 @@ public class LogReadUserRespDTO {
* 可查看日志的用户编号
*/
private Long userId;
/**
* 可查看日志的用户部门编号
*/
private Long deptId;
}

2
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml
View File

@ -10,7 +10,7 @@
-->
<select id="selectRaedUser">
SELECT
*
DISTINCT result.user_id, result.dept_id
FROM
(
SELECT