parent
acd182a9f5
commit
954c0001a5
|
@ -64,7 +64,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("启动处置任务")
|
||||
public ProtocolRespDTO taskStart(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
ErrorCode err = mr.verifyRequest(headers);
|
||||
|
||||
if (err != ErrorCode.ERR_OK) {
|
||||
|
@ -94,7 +94,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("停止处置任务")
|
||||
public ProtocolRespDTO taskStop(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
ErrorCode err = mr.verifyRequest(headers);
|
||||
|
||||
if (err != ErrorCode.ERR_OK) {
|
||||
|
@ -105,14 +105,14 @@ public class DisposeTaskController {
|
|||
TaskInfoRsp rspInfo = new TaskInfoRsp();
|
||||
|
||||
if (reqInfo.getTaskId() == null
|
||||
|| reqInfo.getTaskId().length == 0) {
|
||||
|| reqInfo.getTaskId().length == 0) {
|
||||
return ProtocolRespDTO.result(ErrorCode.ERR_INPUTMISS);
|
||||
}
|
||||
|
||||
for (String v : reqInfo.getTaskId()) {
|
||||
TaskInfoData taskData = TaskInfoData.builder()
|
||||
.taskId(v)
|
||||
.build();
|
||||
.taskId(v)
|
||||
.build();
|
||||
|
||||
taskData.setStatus(err.getCode());
|
||||
taskData.setMessage(err.getMsg());
|
||||
|
@ -136,7 +136,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("根据处置IP停止处置任务")
|
||||
public ProtocolRespDTO taskStopByIp(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
ErrorCode err = mr.verifyRequest(headers);
|
||||
|
||||
if (err != ErrorCode.ERR_OK) {
|
||||
|
@ -148,8 +148,8 @@ public class DisposeTaskController {
|
|||
|
||||
reqInfo.getItems().forEach(v -> {
|
||||
TaskInfoData taskData = TaskInfoData.builder()
|
||||
.type(v.getType())
|
||||
.build();
|
||||
.type(v.getType())
|
||||
.build();
|
||||
|
||||
taskData.setId(v.getId());
|
||||
taskData.setStatus(err.getCode());
|
||||
|
@ -174,7 +174,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("停止处置节点处置任务")
|
||||
public ProtocolRespDTO taskStopAllOfDisposeNode(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
return taskStopByIp(mr, headers);
|
||||
}
|
||||
|
||||
|
@ -191,7 +191,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("启动处置任务")
|
||||
public ProtocolRespDTO taskStopAll(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
return taskStopByIp(mr, headers);
|
||||
}
|
||||
|
||||
|
@ -218,10 +218,10 @@ public class DisposeTaskController {
|
|||
NodeTaskRsp rspInfo = new NodeTaskRsp();
|
||||
|
||||
List<DisposeDevice> valuableData = disposeNodeManager.getAllDisposeDevice()
|
||||
.parallelStream()
|
||||
.filter(v -> reqInfo.getId().length == 0
|
||||
|| Arrays.stream(reqInfo.getId()).anyMatch(s -> s.equals(v.getId().toString())))
|
||||
.collect(Collectors.toList());
|
||||
.parallelStream()
|
||||
.filter(v -> reqInfo.getId().length == 0
|
||||
|| Arrays.stream(reqInfo.getId()).anyMatch(s -> s.equals(v.getId().toString())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
valuableData.parallelStream().forEach(v -> {
|
||||
NodeTaskData taskData = new NodeTaskData();
|
||||
|
@ -235,14 +235,14 @@ public class DisposeTaskController {
|
|||
Long endTm = Timestamp.valueOf(k.getPlanEndTime()).toInstant().toEpochMilli() / 1000;
|
||||
Long diff = endTm - tmLong;
|
||||
TaskInfoData taskInfoData = TaskInfoData.builder()
|
||||
.taskId(k.getId().toString())
|
||||
.type(k.getType())
|
||||
.startTime(tmLong.intValue())
|
||||
.disposeTime(diff.intValue())
|
||||
.disposeIp(k.getDisposeIp())
|
||||
.flowAttack(0)
|
||||
.flowClean(0)
|
||||
.build();
|
||||
.taskId(k.getId().toString())
|
||||
.type(k.getType())
|
||||
.startTime(tmLong.intValue())
|
||||
.disposeTime(diff.intValue())
|
||||
.disposeIp(k.getDisposeIp())
|
||||
.flowAttack(0)
|
||||
.flowClean(0)
|
||||
.build();
|
||||
|
||||
taskData.getTaskArray().add(taskInfoData);
|
||||
bHasData.compareAndSet(false, true);
|
||||
|
@ -261,8 +261,8 @@ public class DisposeTaskController {
|
|||
|
||||
if (reqInfo.getId().length != 0) {
|
||||
List<String> unExists = Arrays.stream(reqInfo.getId())
|
||||
.filter(v -> valuableData.parallelStream().noneMatch(k -> k.getId() == Long.parseLong(v)))
|
||||
.collect(Collectors.toList());
|
||||
.filter(v -> valuableData.parallelStream().noneMatch(k -> k.getId() == Long.parseLong(v)))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
unExists.parallelStream().forEach(v -> {
|
||||
NodeTaskData taskData = new NodeTaskData();
|
||||
|
@ -302,7 +302,7 @@ public class DisposeTaskController {
|
|||
@ApiOperation("获取全部处置任务")
|
||||
public ProtocolRespDTO getAllTask(@RequestBody ProtocolReqDTO mr,
|
||||
@RequestHeader HttpHeaders headers)
|
||||
throws JsonProcessingException {
|
||||
throws JsonProcessingException {
|
||||
ErrorCode err = mr.verifyRequest(headers);
|
||||
|
||||
if (err != ErrorCode.ERR_OK) {
|
||||
|
@ -313,10 +313,10 @@ public class DisposeTaskController {
|
|||
TaskInfoRsp rspInfo = new TaskInfoRsp();
|
||||
|
||||
List<TaskInfoDetail> valuableData = taskService.getAllTask()
|
||||
.parallelStream()
|
||||
.filter(v -> reqInfo.getTaskId().length == 0
|
||||
|| Arrays.stream(reqInfo.getTaskId()).anyMatch(s -> s.equals(v.getId().toString())))
|
||||
.collect(Collectors.toList());
|
||||
.parallelStream()
|
||||
.filter(v -> reqInfo.getTaskId().length == 0
|
||||
|| Arrays.stream(reqInfo.getTaskId()).anyMatch(s -> s.equals(v.getId().toString())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
valuableData.parallelStream().forEach(v -> {
|
||||
Long tmLong = Timestamp.valueOf(v.getBeginTime()).toInstant().toEpochMilli() / 1000;
|
||||
|
@ -324,17 +324,17 @@ public class DisposeTaskController {
|
|||
Long diff = endTm - tmLong;
|
||||
|
||||
TaskInfoData taskInfoData = TaskInfoData.builder()
|
||||
.taskId(v.getId().toString())
|
||||
.type(v.getType())
|
||||
.startTime(tmLong.intValue())
|
||||
.disposeTime(diff.intValue())
|
||||
.disposeIp(v.getDisposeIp())
|
||||
.attackType(getIntArrayByString(v.getAttackType()))
|
||||
.flowDirection(v.getFlowDirection())
|
||||
.flowBandWidth(v.getFlowBandWidth())
|
||||
.flowAttack(0)
|
||||
.flowClean(0)
|
||||
.build();
|
||||
.taskId(v.getId().toString())
|
||||
.type(v.getType())
|
||||
.startTime(tmLong.intValue())
|
||||
.disposeTime(diff.intValue())
|
||||
.disposeIp(v.getDisposeIp())
|
||||
.attackType(getIntArrayByString(v.getAttackType()))
|
||||
.flowDirection(v.getFlowDirection())
|
||||
.flowBandWidth(v.getFlowBandWidth())
|
||||
.flowAttack(0)
|
||||
.flowClean(0)
|
||||
.build();
|
||||
|
||||
rspInfo.getItems().add(taskInfoData);
|
||||
taskInfoData.setId(v.getId().toString());
|
||||
|
@ -344,8 +344,8 @@ public class DisposeTaskController {
|
|||
|
||||
if (reqInfo.getTaskId().length != 0) {
|
||||
List<String> unExists = Arrays.stream(reqInfo.getTaskId())
|
||||
.filter(v -> valuableData.parallelStream().noneMatch(k -> k.getId() == Long.parseLong(v)))
|
||||
.collect(Collectors.toList());
|
||||
.filter(v -> valuableData.parallelStream().noneMatch(k -> k.getId() == Long.parseLong(v)))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
unExists.parallelStream().forEach(v -> {
|
||||
TaskInfoData taskData = new TaskInfoData();
|
||||
|
|
Loading…
Reference in New Issue