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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 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

@@ -48,8 +48,8 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
@Autowired
protected AreaIpCfgDao areaIpCfgDao;
public CfgIndexInfo getBgpCfg(Long cfgId){
CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);
NtcSubscribeIdCfg subscribeId = new NtcSubscribeIdCfg();
subscribeId.setCompileId(entity.getCompileId());
@@ -247,7 +247,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
bgpCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getBgpCfg(Long.parseLong(id));
entity = this.getBgpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -309,7 +309,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getBgpCfg(entity.getCfgId());
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"});