From 81da172c70feb80012e1ecc003b072e1664d0a4a Mon Sep 17 00:00:00 2001 From: duandongmei Date: Wed, 16 Jan 2019 17:26:06 +0600 Subject: [PATCH] =?UTF-8?q?asn=E5=85=B3=E9=94=AE=E5=AD=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8B=E5=8F=91=E6=97=B6=EF=BC=8Casnno=E5=89=8D?= =?UTF-8?q?=E5=8A=A0=E4=B8=8AAS=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 1 + src/main/java/com/nis/web/service/BaseService.java | 12 +++++++++--- .../nis/web/service/basics/AsnGroupInfoService.java | 4 ++-- src/main/resources/nis.properties | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index c073b8725..aad20d1b3 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -497,6 +497,7 @@ public final class Constants { public static final String VOIP_IP_REGION = Configurations.getStringProperty("voip_ip","av_voip_ip"); public static final String VOIP_ACCOUNT_REGION = Configurations.getStringProperty("voip_account","av_voip_account"); public static final String NTC_ASN_NUMBER = Configurations.getStringProperty("ntc_asn_number","NTC_ASN_NUMBER"); + public static final String ASN_KEY = Configurations.getStringProperty("asn_key","AS"); public static final String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0"); public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1); public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2); diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index cad6976c5..f66cabeaf 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -584,7 +584,7 @@ public abstract class BaseService { cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setIsValid(baseCfg.getIsValid()); // 处理配置关键字转译 - cfg.setCfgKeywords(keywordsEscape(asnKeywordCfg.getCfgKeywords())); + cfg.setCfgKeywords(Constants.ASN_KEY+keywordsEscape(asnKeywordCfg.getCfgKeywords())); dstList.add(cfg); } } @@ -3079,9 +3079,10 @@ public abstract class BaseService { * @param srcMap * @param isValid * @param cfgType + * @param commonType 公共组类型 4 ASN * @return */ - public static List convertCommonRegion(Map> srcMap,List commonGroupList,Integer isValid,Integer cfgType) { + public static List convertCommonRegion(Map> srcMap,List commonGroupList,Integer isValid,Integer cfgType,Integer commonType) { for (Integer groupId : srcMap.keySet()) { GroupReuseCfg groupCfg=new GroupReuseCfg(); List strRegionList=new ArrayList<>(); @@ -3119,7 +3120,12 @@ public abstract class BaseService { cfg.setIsHexbin(strCfg.getIsHexbin()); cfg.setExprType(strCfg.getExprType()); // 处理配置关键字转译 - cfg.setCfgKeywords(keywordsEscape(cfg.getCfgKeywords())); + if(commonType == 4){ + cfg.setCfgKeywords(Constants.ASN_KEY+keywordsEscape(cfg.getCfgKeywords())); + }else{ + cfg.setCfgKeywords(keywordsEscape(cfg.getCfgKeywords())); + } + // 增强字符串转换 cfg.setDistrict(keywordsEscape(cfg.getDistrict())); strRegionList.add(cfg); diff --git a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java index 2c50681c7..1efebbf1e 100644 --- a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java @@ -194,7 +194,7 @@ public class AsnGroupInfoService extends BaseService{ srcMap.put(group.getGroupId(), srcList); GroupReuseAddBean commonGroupBean=new GroupReuseAddBean(); List commonGroupList=new ArrayList<>(); - commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2); + commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2,4); commonGroupBean.setGroupReuseCfgList(commonGroupList); //如果已经被引用，则修改 commonGroupBean.setAuditTime(new Date()); @@ -256,7 +256,7 @@ public class AsnGroupInfoService extends BaseService{ srcMap.put(groupId, list2); } } - commonGroupList=convertCommonRegion(srcMap, commonGroupList, 0, 2); + commonGroupList=convertCommonRegion(srcMap, commonGroupList, 0, 2,4); GroupReuseAddBean commonGroupBean=new GroupReuseAddBean(); commonGroupBean.setGroupReuseCfgList(commonGroupList); commonGroupBean.setAuditTime(new Date()); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 65480c533..6c599bee3 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -620,4 +620,4 @@ ntc_asn_number=NTC_ASN_NUMBER addRegionToCommonGroup=v1/addRegionToCommonGroup updateRegionToCommonGroup=v1/updateCommonGroupRegion deleteRegionToCommonGroup=v1/delCommonGroupRegion - +asn_key=AS