gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复数值域无协议ID的时候仍然下发的bug

Browse Source
This commit is contained in:
wangxin
2019-06-20 18:47:26 +08:00
parent b5e49c5dba
commit eab1a85554
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/util/ConfigConvertUtil.java
View File

@@ -633,10 +633,10 @@ public class ConfigConvertUtil {
// 如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况） // 如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况）
//分组复用每个IP组还需要不同的数值域组么？？？？？ //分组复用每个IP组还需要不同的数值域组么？？？？？
if (baseCfg!=null&&baseCfg.getServiceId()!=null&&baseCfg.getServiceId()!=0&&dictMap.containsKey(baseCfg.getServiceId())) { if (baseCfg!=null&&baseCfg.getServiceId()!=null&&baseCfg.getServiceId()>0&&dictMap.containsKey(baseCfg.getServiceId())) {
FunctionServiceDict dict=dictMap.get(baseCfg.getServiceId()); FunctionServiceDict dict=dictMap.get(baseCfg.getServiceId());
Integer protocolId=dict.getProtocolId(); Integer protocolId=dict.getProtocolId();
if (!numGroupVals.contains(protocolId)) { if (protocolId>0&&!numGroupVals.contains(protocolId)) {
GroupCfg group1 = new GroupCfg(); GroupCfg group1 = new GroupCfg();
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
group1.setCompileId(baseCfg.getCompileId()); group1.setCompileId(baseCfg.getCompileId());