还原bgp SubscribeId信息查询方法

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
index 8cd5ac1dd..e8944b55d 100644
--- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
@@ -51,14 +51,14 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 	public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){

 		CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId);

 		List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);

-		/*NtcSubscribeIdCfg  subscribeId = new NtcSubscribeIdCfg();

+		NtcSubscribeIdCfg  subscribeId = new NtcSubscribeIdCfg();

 		subscribeId.setCompileId(entity.getCompileId());

 		subscribeId.setIsValid(entity.getIsValid());

-		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);*/

+		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);

 		List<NtcBgpAsCfg> ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity);

 		//List<HttpUrlCfg> httpUrlList = bgpCfgDao.getHttpUrlList(entity);

 		entity.setIpPortList(ipPortList);

-		//entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList);

+		entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList);

 		entity.setNtcBgpAsCfgList(ntcBgpAsCfgList);

 		//entity.setHttpReqBodyList(httpUrlList);

 		return entity;

@@ -315,7 +315,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 		entity.setAuditTime(new Date());

 		bgpCfgDao.auditCfg(entity);

 		bgpCfgDao.updateBgpAsCfg(entity);

-		//bgpCfgDao.updateSubscribeIdCfg(entity);

+		bgpCfgDao.updateSubscribeIdCfg(entity);

 		ToMaatBean maatBean = new ToMaatBean();		

 		MaatCfg maatCfg = new MaatCfg();

 		List<MaatCfg> configCompileList = new ArrayList();

@@ -343,7 +343,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 			}

 		}

 		

-		/*if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0){

+		if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0){

 			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();

 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

 			cfg.setTableName(NtcSubscribeIdCfg.getTablename());

@@ -353,7 +353,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 				groupRelationList=map.get("groupList");

 				strRegionList=map.get("dstList");

 			}

-		}*/

+		}

 		

 		if(entity.getNtcBgpAsCfgList()!=null && entity.getNtcBgpAsCfgList().size()>0){

 			NtcBgpAsCfg cfg = new NtcBgpAsCfg();