cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 增加迪普旁路手动牵引任务启动、停止业务
2. 增加处置平台业务信息定时同步处理
This commit is contained in:
HuangXin 2021-01-18 14:58:15 +08:00
parent 04cdb57e8f
commit 54d9f4eed7
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
View File

@ -523,10 +523,13 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
// 启动新任务 // 启动新任务
switch (ai.getDev().getDeviceType()) { switch (ai.getDev().getDeviceType()) {
case DPTECH_UMC: case DPTECH_UMC:
case DPTECH_BYPASS_UMC:
dpTechDeviceTaskRun(ai, v, task); dpTechDeviceTaskRun(ai, v, task);
break; break;
case DPTECH_BYPASS_UMC:
restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.DPTECH_BYPASS_UMC);
break;
case HAOHAN_PLATFORM: case HAOHAN_PLATFORM:
restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM); restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM);
break; break;
@ -597,10 +600,13 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
switch (ai.getDev().getDeviceType()) { switch (ai.getDev().getDeviceType()) {
case DPTECH_UMC: case DPTECH_UMC:
case DPTECH_BYPASS_UMC:
dpTechDeviceTaskStop(ai, v, task); dpTechDeviceTaskStop(ai, v, task);
break; break;
case DPTECH_BYPASS_UMC:
restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.DPTECH_BYPASS_UMC);
break;
case HAOHAN_PLATFORM: case HAOHAN_PLATFORM:
restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM); restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM);
break; break;

28
src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
View File

@ -81,9 +81,9 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
@Override @Override
public AbilityInfo getAbilityDevice(Long id) { public AbilityInfo getAbilityDevice(Long id) {
DisposeDevice dev = disposeDeviceManager.getAllNormalDisposeDevices().parallelStream() DisposeDevice dev = disposeDeviceManager.getAllNormalDisposeDevices().parallelStream()
.filter(v -> v.getId().equals(id)) .filter(v -> v.getId().equals(id))
.findAny() .findAny()
.orElse(null); .orElse(null);
if (dev != null) { if (dev != null) {
return disposeAbilityMap.get(getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort())); return disposeAbilityMap.get(getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort()));
@ -147,10 +147,10 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
// 缓存处置设备到Hash表中 // 缓存处置设备到Hash表中
disposeAbilityMap.put(addr, AbilityInfo.builder() disposeAbilityMap.put(addr, AbilityInfo.builder()
.db(db) .db(db)
.dev(dev) .dev(dev)
.linkStatus(false) .linkStatus(false)
.build()); .build());
return ErrorCode.ERR_OK; return ErrorCode.ERR_OK;
} }
@ -167,18 +167,18 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
public ErrorCode verifyDisposeCapacity(Long deviceId, String disposeIp, DisposeCapacityType capacityType) { public ErrorCode verifyDisposeCapacity(Long deviceId, String disposeIp, DisposeCapacityType capacityType) {
if (getAllAbilityDevices().stream() if (getAllAbilityDevices().stream()
.noneMatch(f -> deviceId == -1 || f.getDev().getId().equals(deviceId))) { .noneMatch(f -> deviceId == -1 || f.getDev().getId().equals(deviceId))) {
return ErrorCode.ERR_NOSUCHDEVICE; return ErrorCode.ERR_NOSUCHDEVICE;
} }
if (getAllAbilityDevices().stream() if (getAllAbilityDevices().stream()
.noneMatch(c -> c.getDev().getDevCapacity().stream() .noneMatch(c -> c.getDev().getDevCapacity().stream()
.anyMatch(m -> m.getCapacityType() == capacityType))) { .anyMatch(m -> m.getCapacityType() == capacityType))) {
return ErrorCode.ERR_NOSUCHTYPE; return ErrorCode.ERR_NOSUCHTYPE;
} }
if (getAllAbilityDevices().stream() if (getAllAbilityDevices().stream()
.noneMatch(c -> c.getDb().isCarryProtectIp(disposeIp))) { .noneMatch(c -> c.getDb().isCarryProtectIp(disposeIp))) {
return ErrorCode.ERR_IPNODEVICE; return ErrorCode.ERR_IPNODEVICE;
} }
@ -192,7 +192,11 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
@Async("deviceTaskExecutor") @Async("deviceTaskExecutor")
@Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = 1000)
public void runPeriodTask() { public void runPeriodTask() {
getAllAbilityDevices().forEach(v -> v.getDb().periodTaskRuntime()); getAllAbilityDevices().forEach(v -> {
v.getDb().periodTaskRuntime();
// 同步最新处置平台业务信息到设备
v.getDb().upgradeServiceGroup(serviceGroupMapper.selectAll());
});
} }
/** /**