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

asn关键字配置下发时，asnno前加上AS前缀

Browse Source
This commit is contained in:
duandongmei
2019-01-16 17:26:06 +06:00
parent 924ec9c945
commit 81da172c70
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/util/Constants.java
View File

@@ -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_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 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 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 String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0");
public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1); public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1);
public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2); public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2);

12
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -584,7 +584,7 @@ public abstract class BaseService {
cfg.setAuditTime(baseCfg.getAuditTime()); cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid()); cfg.setIsValid(baseCfg.getIsValid());
// 处理配置关键字转译 // 处理配置关键字转译
cfg.setCfgKeywords(keywordsEscape(asnKeywordCfg.getCfgKeywords())); cfg.setCfgKeywords(Constants.ASN_KEY+keywordsEscape(asnKeywordCfg.getCfgKeywords()));
dstList.add(cfg); dstList.add(cfg);
} }
} }
@@ -3079,9 +3079,10 @@ public abstract class BaseService {
* @param srcMap * @param srcMap
* @param isValid * @param isValid
* @param cfgType * @param cfgType
* @param commonType 公共组类型 4 ASN
* @return * @return
*/ */
public static <T> List<GroupReuseCfg> convertCommonRegion(Map<Integer,List<T>> srcMap,List<GroupReuseCfg> commonGroupList,Integer isValid,Integer cfgType) { public static <T> List<GroupReuseCfg> convertCommonRegion(Map<Integer,List<T>> srcMap,List<GroupReuseCfg> commonGroupList,Integer isValid,Integer cfgType,Integer commonType) {
for (Integer groupId : srcMap.keySet()) { for (Integer groupId : srcMap.keySet()) {
GroupReuseCfg groupCfg=new GroupReuseCfg(); GroupReuseCfg groupCfg=new GroupReuseCfg();
List<StringCfg> strRegionList=new ArrayList<>(); List<StringCfg> strRegionList=new ArrayList<>();
@@ -3119,7 +3120,12 @@ public abstract class BaseService {
cfg.setIsHexbin(strCfg.getIsHexbin()); cfg.setIsHexbin(strCfg.getIsHexbin());
cfg.setExprType(strCfg.getExprType()); 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())); cfg.setDistrict(keywordsEscape(cfg.getDistrict()));
strRegionList.add(cfg); strRegionList.add(cfg);

4
src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java
View File

@@ -194,7 +194,7 @@ public class AsnGroupInfoService extends BaseService{
srcMap.put(group.getGroupId(), srcList); srcMap.put(group.getGroupId(), srcList);
GroupReuseAddBean commonGroupBean=new GroupReuseAddBean(); GroupReuseAddBean commonGroupBean=new GroupReuseAddBean();
List<GroupReuseCfg> commonGroupList=new ArrayList<>(); List<GroupReuseCfg> commonGroupList=new ArrayList<>();
commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2); commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2,4);
commonGroupBean.setGroupReuseCfgList(commonGroupList); commonGroupBean.setGroupReuseCfgList(commonGroupList);
//如果已经被引用，则修改 //如果已经被引用，则修改
commonGroupBean.setAuditTime(new Date()); commonGroupBean.setAuditTime(new Date());
@@ -256,7 +256,7 @@ public class AsnGroupInfoService extends BaseService{
srcMap.put(groupId, list2); srcMap.put(groupId, list2);
} }
} }
commonGroupList=convertCommonRegion(srcMap, commonGroupList, 0, 2); commonGroupList=convertCommonRegion(srcMap, commonGroupList, 0, 2,4);
GroupReuseAddBean commonGroupBean=new GroupReuseAddBean(); GroupReuseAddBean commonGroupBean=new GroupReuseAddBean();
commonGroupBean.setGroupReuseCfgList(commonGroupList); commonGroupBean.setGroupReuseCfgList(commonGroupList);
commonGroupBean.setAuditTime(new Date()); commonGroupBean.setAuditTime(new Date());

2
src/main/resources/nis.properties
View File

@@ -620,4 +620,4 @@ ntc_asn_number=NTC_ASN_NUMBER
addRegionToCommonGroup=v1/addRegionToCommonGroup addRegionToCommonGroup=v1/addRegionToCommonGroup
updateRegionToCommonGroup=v1/updateCommonGroupRegion updateRegionToCommonGroup=v1/updateCommonGroupRegion
deleteRegionToCommonGroup=v1/delCommonGroupRegion deleteRegionToCommonGroup=v1/delCommonGroupRegion
asn_key=AS