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

OCT 

REM:
1. 增加迪普设备获取防护对象和防护模板关联关系
This commit is contained in:
HuangXin 2021-01-14 15:00:21 +08:00
parent b640ce5f27
commit 3625cf0069
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dispose/ability/impl/DpTechAbilityImpl.java
View File

@ -363,8 +363,10 @@ public class DpTechAbilityImpl implements DisposeAbility {
public void periodTaskRuntime() {
log.debug("++++DpTech Period Task Running");
// 更新防护对象
getDisposeDeviceProtectObject();
if (timerCnt++ % DpTechConfigValue.PROTECTION_UPGRADE_PERIOD == 0) {
// 定时检测防护对象
getDisposeDeviceProtectObject();
}
// 更新心跳状态
if (timerCnt++ % DisposeConfigValue.HEART_PERIOD_OF_SECOND == 0) {

20
src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
View File

@ -81,6 +81,15 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
return;
}
if (ret.getProtectionTargetWithStrategyForService().size() == 0) {
log.info("----Finish Begging DPTech Get All Protection Strategy Association Relation");
return;
}
ret.getProtectionTargetWithStrategyForService().forEach(k -> {
});
log.info("----Finish Begging DPTech Get All Protection Strategy Association Relation");
@ -125,6 +134,11 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
return;
}
if (ret.getProtectionObjectDataForService().size() == 0) {
log.debug("----Finish DPTech Get All Protection Objects Succeed");
return;
}
ret.getProtectionObjectDataForService().forEach(k -> {
String objName = k.getProtectionName().getValue();
// 删除非法的防护对象
@ -143,7 +157,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
} else {
DpProtectObject obj;
if (!dpBypassManager.getProtectObject().containsKey(objName)) {
if (dpBypassManager.getProtectObject().containsKey(objName)) {
// 获取防护对象
obj = dpBypassManager.getProtectObject().get(objName);
} else {
@ -207,8 +221,8 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
super.periodTaskRuntime();
if (timerCnt++ % DpTechConfigValue.PROTECTION_UPGRADE_PERIOD == 0) {
// 定时检测防护对象
getDisposeDeviceProtectObject();
// 更新防护对象与目标关联关系
getProtectionStrategyTemplate();
}
}
}