Merge remote-tracking branch 'origin/v2.0.3_dev' into v2.0.3_dev

# Conflicts:
#	src/main/java/com/dispose/mapper/DeviceTaskMapper.java
#	src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
This commit is contained in:
HuangXin 2020-11-13 17:10:13 +08:00
commit c250fd01b2
2 changed files with 54 additions and 26 deletions
src/main
java/com/dispose/ability/impl
resources/mappers

View File

@ -7,7 +7,12 @@ import com.dispose.common.ErrorCode;
import com.dispose.common.Helper;
import com.dispose.common.IpAddrType;
import com.dispose.common.NetflowDirection;
import com.dispose.common.DisposeDeviceType;
import com.dispose.manager.DisposeTaskManager;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
import com.dispose.pojo.entity.DeviceTask;
import com.dispose.pojo.entity.DisposeTask;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.pojo.vo.DeviceFirewareInfo;
import com.pengxin.dispose.common.PengXinDisposeAbilityRsp;
@ -24,9 +29,11 @@ import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* The type Peng xin ability.
@ -35,6 +42,17 @@ import java.util.List;
*/
@Slf4j
public class PengXinAbilityImpl implements DisposeAbility {
/**
* The Dispose task manager.
*/
@Resource
private DisposeTaskManager disposeTaskManager;
/**
* The Dispose device mapper.
*/
@Resource
private DisposeDeviceMapper disposeDeviceMapper;
/**
* The Protect ip v 4.
@ -84,7 +102,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
/**
* The Peng xin dispose type.
*/
private final Integer[] pengXinDisposeType = new Integer[] {0, 4, 1, 3};
private final Integer[] pengXinDisposeType = new Integer[]{0, 4, 1, 3};
/**
* Gets peng xin task type.
@ -168,12 +186,12 @@ public class PengXinAbilityImpl implements DisposeAbility {
}
reqItems.add(PengXinStartTaskItem.builder()
.type(getPengXinTaskType(capType))
.disposeObject(disposeObject)
.objectType(getPengXinObjectType(objectType))
.disposeTime(duration)
.taskReqId(String.valueOf(taskReqId++))
.build());
.type(getPengXinTaskType(capType))
.disposeObject(disposeObject)
.objectType(getPengXinObjectType(objectType))
.disposeTime(duration)
.taskReqId(String.valueOf(taskReqId++))
.build());
ProtocolRespDTO<PengXinStartTaskRsp> rspInfo = restfulInterface.startDisposeTask(url, token, reqItems);
@ -231,7 +249,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
}
ProtocolRespDTO<PengXinStopTaskRsp> rspInfo = restfulInterface.stopDisposeTask(url, token,
new String[]{taskId});
new String[]{taskId});
// 判断是否token过期
if (rspInfo != null && rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) {
@ -261,18 +279,18 @@ public class PengXinAbilityImpl implements DisposeAbility {
@Override
public MulReturnType<ErrorCode, DeviceFirewareInfo> getAbilityDeviceFireware() {
return new MulReturnType<>(ErrorCode.ERR_OK,
DeviceFirewareInfo.builder()
.vendor("PengXin")
.model("Unknown")
.firmware("Unknown")
.os("Linux Server")
.kernel("Linux")
.arch("x86_64")
.version("Unknown")
.memory(-1)
.freeMemory(-1)
.cpuUsed(-1)
.build());
DeviceFirewareInfo.builder()
.vendor("PengXin")
.model("Unknown")
.firmware("Unknown")
.os("Linux Server")
.kernel("Linux")
.arch("x86_64")
.version("Unknown")
.memory(-1)
.freeMemory(-1)
.cpuUsed(-1)
.build());
}
/**
@ -423,25 +441,35 @@ public class PengXinAbilityImpl implements DisposeAbility {
try {
String url = urlRootPath + "dispose_device/task/get";
DisposeTask task = disposeTaskManager.getDisposeTaskById(taskId);
if (task == null) {
return new MulReturnType<>(ErrorCode.ERR_NOSUCHTASK, -1L);
}
//根据设备ID获取设备信息判断任务列表中的设备为鹏信获取externId
List<DeviceTask> dev = task.getDeviceTask().stream().
filter(v -> disposeDeviceMapper.getDeviceById(v.getDeviceId()).getDeviceType() == DisposeDeviceType.PENGXIN_PLATFORM).collect(Collectors.toList());
ProtocolRespDTO<PengXinTaskStatusRsp> rspInfo = restfulInterface.getDeviceTaskStatus(url, token,
new String[] {String.valueOf(taskId)});
new String[]{String.valueOf(dev.get(0).getExternId())});
// 判断是否token过期
if (rspInfo != null && rspInfo.getCode() == HttpServletResponse.SC_UNAUTHORIZED) {
// 重新登录获取 token
upgradeToken();
rspInfo = restfulInterface.getDeviceTaskStatus(urlRootPath, token,
new String[] {String.valueOf(taskId)});
rspInfo = restfulInterface.getDeviceTaskStatus(url, token,
new String[]{String.valueOf(dev.get(0).getExternId())});
}
if (rspInfo != null && rspInfo.getCode() == ErrorCode.ERR_OK.getHttpCode()) {
if(rspInfo.getMsgContent().getItems().size() == 0) {
if (rspInfo.getMsgContent().getItems().size() == 0) {
return new MulReturnType<>(ErrorCode.ERR_NOSUCHTASK, -1L);
}
return new MulReturnType<>(ErrorCode.ERR_OK,
rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
} else {
return new MulReturnType<>(ErrorCode.ERR_CALLDEVICE, -1L);
}

View File

@ -90,7 +90,7 @@
<update id="changeTaskDevStatus">
UPDATE device_task
SET status = #{status}
SET devStatus = #{devStatus}
WHERE id = #{id}
</update>