From 233a02b7dcbb9100746a6fec78ee97b03cc55d7e Mon Sep 17 00:00:00 2001 From: leijun Date: Tue, 16 Apr 2019 15:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=96=B9=E6=B3=95=E4=B8=AD=E9=87=8D=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/service/configuration/BgpCfgService.java | 8 ++++---- .../nis/web/service/configuration/DomainService.java | 2 +- .../service/configuration/FileTransferCfgService.java | 4 ++-- .../nis/web/service/configuration/MailCfgService.java | 2 +- .../web/service/configuration/WebsiteCfgService.java | 10 +++++----- 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 { public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){ CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId); List ipPortList = bgpCfgDao.getIpPortList(entity); - NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg(); + /*NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg(); subscribeId.setCompileId(entity.getCompileId()); subscribeId.setIsValid(entity.getIsValid()); - List ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId); + List ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);*/ List ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity); //List 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 { List 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 { List 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 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 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 { List 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 { List 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 { List 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 { 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 { 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 { List 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"});