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

优化配置审核方法中重复查询配置信息

Browse Source
This commit is contained in:
leijun
2019-04-16 15:49:21 +08:00
parent 02bade2de0
commit 233a02b7dc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/BgpCfgService.java
View File

@@ -51,14 +51,14 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){ public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId); CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity); List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);
NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg(); /*NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg();
subscribeId.setCompileId(entity.getCompileId()); subscribeId.setCompileId(entity.getCompileId());
subscribeId.setIsValid(entity.getIsValid()); subscribeId.setIsValid(entity.getIsValid());
List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId); List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);*/
List<NtcBgpAsCfg> ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity); List<NtcBgpAsCfg> ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity);
//List<HttpUrlCfg> httpUrlList = bgpCfgDao.getHttpUrlList(entity); //List<HttpUrlCfg> httpUrlList = bgpCfgDao.getHttpUrlList(entity);
entity.setIpPortList(ipPortList); entity.setIpPortList(ipPortList);
entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList); //entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList);
entity.setNtcBgpAsCfgList(ntcBgpAsCfgList); entity.setNtcBgpAsCfgList(ntcBgpAsCfgList);
//entity.setHttpReqBodyList(httpUrlList); //entity.setHttpReqBodyList(httpUrlList);
return entity; return entity;
@@ -327,7 +327,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

2
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -592,7 +592,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
HttpUrlCfg cfg = new HttpUrlCfg(); HttpUrlCfg cfg = new HttpUrlCfg();

4
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -299,7 +299,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -965,7 +965,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

2
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -311,7 +311,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

10
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -455,7 +455,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -885,7 +885,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -956,7 +956,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
maatBean.setAuditTime(entity.getAuditTime()); maatBean.setAuditTime(entity.getAuditTime());
maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setCreatorName(entity.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION); maatBean.setOpAction(opAction);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
logger.info("ssl配置下发配置参数："+json); logger.info("ssl配置下发配置参数："+json);
@@ -973,7 +973,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
maatBean.setAuditTime(entity.getAuditTime()); maatBean.setAuditTime(entity.getAuditTime());
maatBean.setCreatorName(entity.getCurrentUser().getName()); maatBean.setCreatorName(entity.getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(opAction); maatBean.setOpAction(Constants.INSERT_ACTION);
//调用服务接口取消配置 //调用服务接口取消配置
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
logger.info("ssl配置下发配置参数："+json); logger.info("ssl配置下发配置参数："+json);
@@ -1193,7 +1193,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList(); 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){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});