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

asn ip去掉导入模板中的cfgDesc

Browse Source 
；
修复主表中未存储commonGroupIds的bug；
asn ip导入时，asn_group_info的regionid
This commit is contained in:
duandongmei
2019-01-18 15:15:06 +06:00
parent 2d4a1a6685
commit b9c9b5aab9
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2982,7 +2982,7 @@ public abstract class BaseService {
if(!StringUtil.isEmpty(commonGroupIds)){
commonGroupIds=commonGroupIds.substring(0, commonGroupIds.length()-1);
}
entity.setCommonGroupIds(commonGroupIds);
/*entity.setCommonGroupIds(commonGroupIds);*/
//return entity;
}
/**
@@ -3031,6 +3031,12 @@ public abstract class BaseService {
AsnKeywordCfg asnCfg=new AsnKeywordCfg();
BeanUtils.copyProperties(entity, asnCfg,new String[]{"cfgId","userReigon1","userReigon2","userReigon3","userReigon4","userReigon5"});
asnCfg.setTableName(AsnKeywordCfg.getTablename());
asnCfg.setCfgId(asnKeywordCfg.getCfgId());
asnCfg.setUserRegion1(asnKeywordCfg.getUserRegion1());
asnCfg.setUserRegion2(asnKeywordCfg.getUserRegion2());
asnCfg.setUserRegion3(asnKeywordCfg.getUserRegion3());
asnCfg.setUserRegion4(asnKeywordCfg.getUserRegion4());
asnCfg.setUserRegion5(asnKeywordCfg.getUserRegion5());
stringCfgDao.updateAsnKeyword(asnCfg);
}
//3、//根据asnGroupIdList查询所有下发过的ASN NO
@@ -3083,9 +3089,13 @@ public abstract class BaseService {
asnGroupInfoDao.updateIsUsedAndIsValid(notAuditGroupIdList,1,null);
}
//6、标记组已被策略标记为全部下发
configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList );
if(!StringUtil.isEmpty(signAuditAllGroupList)){
configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList );
}
//7、标记组已被策略引用
configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList);
if(!StringUtil.isEmpty(isUsedGroupIdList)){
configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList);
}
//8、maat配置转换
if(!StringUtil.isEmpty(newAsnList)){
Map<String,List> map = cfgConvert(strRegionList,newAsnList,7,entity,groupRelationList);