manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 数据清理时添加条数限制.

Browse Source
This commit is contained in:
lijiahang
2024-08-26 17:10:40 +08:00
parent 6c60756e54
commit a0adb415fa
41 changed files with 295 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java
View File

@@ -3,6 +3,7 @@ package com.orion.visor.module.asset.controller;
import com.orion.lang.define.wrapper.DataGrid;
import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import com.orion.visor.framework.common.utils.Valid;
import com.orion.visor.framework.common.validator.group.Clear;
import com.orion.visor.framework.common.validator.group.Page;
import com.orion.visor.framework.log.core.annotation.IgnoreLog;
import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
@@ -136,7 +137,7 @@ public class ExecCommandLogController {
@PostMapping("/clear")
@Operation(summary = "清空批量执行日志")
@PreAuthorize("@ss.hasPermission('asset:exec-command-log:management:clear')")
public Integer clearExecCommandLog(@RequestBody ExecLogQueryRequest request) {
public Integer clearExecCommandLog(@Validated(Clear.class) @RequestBody ExecLogQueryRequest request) {
request.setSource(SOURCE);
return execLogService.clearExecLog(request);
}
@@ -178,4 +179,3 @@ public class ExecCommandLogController {
}
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java
View File

@@ -3,6 +3,7 @@ package com.orion.visor.module.asset.controller;
import com.orion.lang.define.wrapper.DataGrid;
import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import com.orion.visor.framework.common.utils.Valid;
import com.orion.visor.framework.common.validator.group.Clear;
import com.orion.visor.framework.common.validator.group.Page;
import com.orion.visor.framework.log.core.annotation.IgnoreLog;
import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
@@ -125,7 +126,7 @@ public class ExecJobLogController {
@PostMapping("/clear")
@Operation(summary = "清空计划任务日志")
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:management:clear')")
public Integer clearExecJobLog(@RequestBody ExecLogQueryRequest request) {
public Integer clearExecJobLog(@Validated(Clear.class) @RequestBody ExecLogQueryRequest request) {
request.setSource(SOURCE);
return execLogService.clearExecLog(request);
}
@@ -167,4 +168,3 @@ public class ExecJobLogController {
}
}

3
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java
View File

@@ -2,6 +2,7 @@ package com.orion.visor.module.asset.controller;
import com.orion.lang.define.wrapper.DataGrid;
import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import com.orion.visor.framework.common.validator.group.Clear;
import com.orion.visor.framework.common.validator.group.Id;
import com.orion.visor.framework.common.validator.group.Page;
import com.orion.visor.framework.log.core.annotation.IgnoreLog;
@@ -84,7 +85,7 @@ public class HostConnectLogController {
@PostMapping("/clear")
@Operation(summary = "清空主机连接日志")
@PreAuthorize("@ss.hasPermission('asset:host-connect-log:management:clear')")
public Integer clearHostConnectLog(@RequestBody HostConnectLogQueryRequest request) {
public Integer clearHostConnectLog(@Validated(Clear.class) @RequestBody HostConnectLogQueryRequest request) {
return hostConnectLogService.clearHostConnectLog(request);
}

3
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/UploadTaskController.java
View File

@@ -2,6 +2,7 @@ package com.orion.visor.module.asset.controller;
import com.orion.lang.define.wrapper.DataGrid;
import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import com.orion.visor.framework.common.validator.group.Clear;
import com.orion.visor.framework.common.validator.group.Page;
import com.orion.visor.framework.log.core.annotation.IgnoreLog;
import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
@@ -123,7 +124,7 @@ public class UploadTaskController {
@PostMapping("/clear")
@Operation(summary = "清空上传任务")
@PreAuthorize("@ss.hasPermission('asset:upload-task:management:clear')")
public Integer clearUploadTask(@RequestBody UploadTaskQueryRequest request) {
public Integer clearUploadTask(@Validated(Clear.class) @RequestBody UploadTaskQueryRequest request) {
return uploadTaskService.clearUploadTask(request);
}

17
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java
View File

@@ -1,10 +1,15 @@
package com.orion.visor.module.asset.entity.request.exec;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.orion.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.entity.PageRequest;
import com.orion.visor.framework.common.validator.group.Clear;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
@@ -62,4 +67,16 @@ public class ExecLogQueryRequest extends PageRequest {
@Schema(description = "状态")
private List<String> statusList;
@NotNull(groups = Clear.class)
@Min(value = 1, groups = Clear.class)
@Max(value = 1000, groups = Clear.class)
@Schema(description = "清理数量限制")
private Integer clearLimit;
public void setClearLimit(Integer clearLimit) {
this.clearLimit = clearLimit;
this.setPage(Const.N_1);
this.setLimit(clearLimit);
}
}

19
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostConnectLogQueryRequest.java
View File

@@ -1,10 +1,16 @@
package com.orion.visor.module.asset.entity.request.host;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.orion.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.entity.PageRequest;
import com.orion.visor.framework.common.validator.group.Clear;
import com.orion.visor.framework.common.validator.group.Id;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
@@ -24,6 +30,7 @@ import java.util.List;
@Schema(name = "HostConnectLogQueryRequest", description = "主机连接日志 查询请求对象")
public class HostConnectLogQueryRequest extends PageRequest {
@NotNull(groups = Id.class)
@Schema(description = "id")
private Long id;
@@ -63,4 +70,16 @@ public class HostConnectLogQueryRequest extends PageRequest {
@Schema(description = "状态")
private List<String> statusList;
@NotNull(groups = Clear.class)
@Min(value = 1, groups = Clear.class)
@Max(value = 2000, groups = Clear.class)
@Schema(description = "清理数量限制")
private Integer clearLimit;
public void setClearLimit(Integer clearLimit) {
this.clearLimit = clearLimit;
this.setPage(Const.N_1);
this.setLimit(clearLimit);
}
}

6
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostCreateRequest.java
View File

@@ -5,8 +5,9 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
@@ -45,7 +46,8 @@ public class HostCreateRequest implements Serializable {
@Schema(description = "主机地址")
private String address;
@Range(min = 1, max = 65535)
@Min(value = 1)
@Max(value = 65535)
@Schema(description = "主机端口")
private Integer port;

9
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateRequest.java
View File

@@ -5,11 +5,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import javax.validation.constraints.*;
import java.io.Serializable;
import java.util.List;
@@ -46,7 +43,9 @@ public class HostUpdateRequest implements Serializable {
@Schema(description = "主机地址")
private String address;
@Range(min = 1, max = 65535)
@NotNull
@Min(value = 1)
@Max(value = 65535)
@Schema(description = "主机端口")
private Integer port;

17
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java
View File

@@ -1,10 +1,15 @@
package com.orion.visor.module.asset.entity.request.upload;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.orion.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.entity.PageRequest;
import com.orion.visor.framework.common.validator.group.Clear;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.Date;
@@ -44,4 +49,16 @@ public class UploadTaskQueryRequest extends PageRequest {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date[] createTimeRange;
@NotNull(groups = Clear.class)
@Min(value = 1, groups = Clear.class)
@Max(value = 2000, groups = Clear.class)
@Schema(description = "清理数量限制")
private Integer clearLimit;
public void setClearLimit(Integer clearLimit) {
this.clearLimit = clearLimit;
this.setPage(Const.N_1);
this.setLimit(clearLimit);
}
}

8
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java
View File

@@ -6,11 +6,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import javax.validation.constraints.*;
/**
* 主机 SSH 配置
@@ -64,7 +61,8 @@ public class HostSshConfigModel implements GenericsDataModel, UpdatePasswordActi
* 连接超时时间
*/
@NotNull
@Range(min = 0, max = 100000)
@Min(value = 1)
@Max(value = 100000)
private Integer connectTimeout;
/**

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java
View File

@@ -18,6 +18,7 @@ import com.orion.visor.framework.common.constant.ErrorMessage;
import com.orion.visor.framework.common.constant.FileConst;
import com.orion.visor.framework.common.enums.EndpointDefine;
import com.orion.visor.framework.common.file.FileClient;
import com.orion.visor.framework.common.utils.SqlUtils;
import com.orion.visor.framework.common.utils.Valid;
import com.orion.visor.framework.redis.core.utils.RedisStrings;
import com.orion.visor.framework.security.core.utils.SecurityUtils;
@@ -227,7 +228,8 @@ public class ExecLogServiceImpl implements ExecLogService {
log.info("ExecLogService.clearExecLog start {}", JSON.toJSONString(request));
// 查询
LambdaQueryWrapper<ExecLogDO> wrapper = this.buildQueryWrapper(request)
.select(ExecLogDO::getId);
.select(ExecLogDO::getId)
.last(SqlUtils.limit(request.getClearLimit()));
List<Long> idList = execLogDAO.selectList(wrapper)
.stream()
.map(ExecLogDO::getId)

9
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConnectLogServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.orion.lang.utils.collect.Lists;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import com.orion.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.constant.ErrorMessage;
import com.orion.visor.framework.common.utils.SqlUtils;
import com.orion.visor.framework.common.utils.Valid;
import com.orion.visor.framework.security.core.utils.SecurityUtils;
import com.orion.visor.module.asset.convert.HostConnectLogConvert;
@@ -26,6 +27,7 @@ import com.orion.visor.module.asset.service.HostConnectLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -167,13 +169,14 @@ public class HostConnectLogServiceImpl implements HostConnectLogService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public Integer deleteHostConnectLog(List<Long> idList) {
log.info("HostConnectLogService.deleteHostConnectLog start {}", JSON.toJSONString(idList));
if (Lists.isEmpty(idList)) {
OperatorLogs.add(OperatorLogs.COUNT, Const.N_0);
return Const.N_0;
}
// 删除
// 删除日志表
int effect = hostConnectLogDAO.deleteBatchIds(idList);
log.info("HostConnectLogService.deleteHostConnectLog finish {}", effect);
// 设置日志参数
@@ -187,11 +190,13 @@ public class HostConnectLogServiceImpl implements HostConnectLogService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public Integer clearHostConnectLog(HostConnectLogQueryRequest request) {
log.info("HostConnectLogService.clearHostConnectLog start {}", JSON.toJSONString(request));
// 查询
LambdaQueryWrapper<HostConnectLogDO> wrapper = this.buildQueryWrapper(request)
.select(HostConnectLogDO::getId);
.select(HostConnectLogDO::getId)
.last(SqlUtils.limit(request.getClearLimit()));
List<HostConnectLogDO> list = hostConnectLogDAO.selectList(wrapper);
if (list.isEmpty()) {
log.info("HostConnectLogService.clearHostConnectLog empty");

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java
View File

@@ -18,6 +18,7 @@ import com.orion.visor.framework.common.constant.ErrorMessage;
import com.orion.visor.framework.common.enums.EndpointDefine;
import com.orion.visor.framework.common.file.FileClient;
import com.orion.visor.framework.common.security.LoginUser;
import com.orion.visor.framework.common.utils.SqlUtils;
import com.orion.visor.framework.common.utils.Valid;
import com.orion.visor.framework.mybatis.core.query.Conditions;
import com.orion.visor.framework.security.core.utils.SecurityUtils;
@@ -226,7 +227,8 @@ public class UploadTaskServiceImpl implements UploadTaskService {
public Integer clearUploadTask(UploadTaskQueryRequest request) {
// 查询id
LambdaQueryWrapper<UploadTaskDO> wrapper = this.buildQueryWrapper(request)
.select(UploadTaskDO::getId);
.select(UploadTaskDO::getId)
.last(SqlUtils.limit(request.getClearLimit()));
List<Long> idList = uploadTaskDAO.of(wrapper)
.list(UploadTaskDO::getId);
// 删除