diff options
| author | wangxin <[email protected]> | 2019-06-20 18:47:26 +0800 |
|---|---|---|
| committer | wangxin <[email protected]> | 2019-06-20 18:47:26 +0800 |
| commit | eab1a85554346dcf8a3e4433dca198887235537c (patch) | |
| tree | 50217b642794542b4f6c3a3a237506b3e46408c5 | |
| parent | b5e49c5dbafbcbff36e16bbeb46345eb1ebf6062 (diff) | |
修复数值域无协议ID的时候仍然下发的bug
| -rw-r--r-- | src/main/java/com/nis/util/ConfigConvertUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java index 51b224ab4..d834058d3 100644 --- a/src/main/java/com/nis/util/ConfigConvertUtil.java +++ b/src/main/java/com/nis/util/ConfigConvertUtil.java @@ -633,10 +633,10 @@ public class ConfigConvertUtil { // 如果protocolId非空非零，需要构造数值型域配置，多条相同协议的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());
Integer protocolId=dict.getProtocolId();
- if (!numGroupVals.contains(protocolId)) {
+ if (protocolId>0&&!numGroupVals.contains(protocolId)) {
GroupCfg group1 = new GroupCfg();
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
group1.setCompileId(baseCfg.getCompileId());
|