Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

5 files changed, 13 insertions, 13 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 bb8b4f147..8cd5ac1dd 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;

@@ -327,7 +327,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getBgpCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getBgpCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index f477b7481..5c4a239f4 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -592,7 +592,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				List<IpCfg> areaIpRegionList = new ArrayList();

 				

 				//查询子配置并修改审核状态

-				entity = this.getDomainCfg(entity.getCfgId(),entity.getCompileId());

+				//entity = this.getDomainCfg(entity.getCfgId(),entity.getCompileId());

 				

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

 					HttpUrlCfg cfg = new HttpUrlCfg();

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index bdf4fa6e9..6d4bf4155 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -299,7 +299,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

@@ -965,7 +965,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getP2pCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getP2pCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index e529a4331..fcc490d35 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -311,7 +311,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 5182769cf..f9e9d9c8a 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -455,7 +455,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

@@ -885,7 +885,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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

@@ -956,7 +956,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatBean.setAuditTime(entity.getAuditTime());

 			maatBean.setCreatorName(entity.getCurrentUser().getName());

 			maatBean.setVersion(Constants.MAAT_VERSION);

-			maatBean.setOpAction(Constants.INSERT_ACTION);

+			maatBean.setOpAction(opAction);

 			//调用服务接口下发配置数据

 			String json=gsonToJson(maatBean);

 			logger.info("ssl配置下发配置参数："+json);

@@ -973,7 +973,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatBean.setAuditTime(entity.getAuditTime());

 			maatBean.setCreatorName(entity.getCurrentUser().getName());

 			maatBean.setVersion(Constants.MAAT_VERSION);

-			maatBean.setOpAction(opAction);

+			maatBean.setOpAction(Constants.INSERT_ACTION);

 			//调用服务接口取消配置

 			String json=gsonToJson(maatBean);

 			logger.info("ssl配置下发配置参数："+json);

@@ -1193,7 +1193,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();

 		

 		//查询子配置并修改审核状态

-		entity = this.getDnsCfg(entity.getCfgId(),entity.getCompileId());

+		//entity = this.getDnsCfg(entity.getCfgId(),entity.getCompileId());

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

 			IpPortCfg cfg = new IpPortCfg();

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