wangli/axzo-log-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' into 'test'

Browse Source 
Uat

See merge request infra/xlog!53
This commit is contained in:
彭健 2022-10-22 06:03:29 +00:00
commit 7160b07214
3 changed files with 51 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryReq.java
View File

@ -2,7 +2,6 @@ package cn.axzo.log.platform.client.model;
import cn.axzo.core.domain.PageRequest;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.util.Date;
@ -16,69 +15,65 @@ import java.util.List;
@Data
public class OperateLogQueryReq extends PageRequest {
/**
* 调用方服务名
*/
private String serviceName;
/**
* 调用方服务名
*/
private String serviceName;
/**
* 操作人
*/
private String operateUserName;
/**
* 操作人
*/
private String operateUserName;
/**
* 事件类型
*/
private List<String> featureCodes;
/**
* 事件类型
*/
private List<String> featureCodes;
/**
* 功能name
*/
private String featureName;
/**
* 功能name
*/
private String featureName;
/**
* 开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 工作台Id
*/
@JsonIgnore
private Long workspaceId;
/**
* 工作台Id
*/
private Long workspaceId;
/**
* 单位Id
*/
@JsonIgnore
private Long ouId;
/**
* 单位Id
*/
private Long ouId;
/**
* 身份Id
*/
@JsonIgnore
private Long identityId;
/**
* 身份Id
*/
private Long identityId;
/**
* 身份类型
*/
@JsonIgnore
private Integer identityType;
/**
* 身份类型
*/
private Integer identityType;
/**
* 操作类型 1:add 2:add_batch 3:update 4:update_batch 5:delete 6:delete_batch
*/
private Integer operateType;
/**
* 操作类型 1:add 2:add_batch 3:update 4:update_batch 5:delete 6:delete_batch
*/
private Integer operateType;
/**
* 操作表名
*/
private String operateTable;
/**
* 操作表名
*/
private String operateTable;
}

5
axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryReqDTO.java
View File

@ -3,7 +3,6 @@ package cn.axzo.log.platform.server.dto;
import cn.axzo.basics.common.page.PageRequest;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -60,28 +59,24 @@ public class OperateLogQueryReqDTO extends PageRequest {
* 工作台Id
*/
@ApiModelProperty(value = "工作台Id", position = 7)
@JsonIgnore
private Long workspaceId;
/**
* 单位Id
*/
@ApiModelProperty(value = "单位Id", position = 8)
@JsonIgnore
private Long ouId;
/**
* 身份Id
*/
@ApiModelProperty(value = "身份Id", position = 9)
@JsonIgnore
private Long identityId;
/**
* 身份类型
*/
@ApiModelProperty(value = "身份类型", position = 10)
@JsonIgnore
private Integer identityType;
/**

1
axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/impl/OperateLogRepositoryImpl.java
View File

@ -41,6 +41,7 @@ public class OperateLogRepositoryImpl implements OperateLogRepository {
.ge(req.getStartTime() != null, OperateLogRecordEntity::getOperateTime, req.getStartTime())
.le(req.getEndTime() != null, OperateLogRecordEntity::getOperateTime, req.getEndTime())
.eq(req.getWorkspaceId() != null && req.getWorkspaceId() != 0L, OperateLogRecordEntity::getWorkspaceId, req.getWorkspaceId())
.eq(req.getIdentityId() != null && req.getIdentityId() != 0L, OperateLogRecordEntity::getIdentityId, req.getIdentityId())
.eq(req.getOuId() != null && req.getOuId() != 0L, OperateLogRecordEntity::getOuId, req.getOuId())
.eq(req.getOperateType() != null, OperateLogRecordEntity::getOperateType, req.getOperateType())
.orderByDesc(OperateLogRecordEntity::getCreateAt)