diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java index 83a5eb280..15f6853be 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java @@ -41,6 +41,7 @@ public interface BgpCfgDao extends CrudDao{ public void saveIpPortCfg(IpPortCfg entity); public void updateBgpAsCfg(CfgIndexInfo entity); public void updateSubscribeIdCfg(CfgIndexInfo entity); + public void deleteSubscribeIdCfg(CfgIndexInfo entity); //public void saveHttpUrlCfg(HttpUrlCfg entity); public void deleteHttpIpCfg(CfgIndexInfo entity); //public void deleteHttpUrlCfg(CfgIndexInfo entity); diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml index be0035cba..2553b3695 100644 --- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml @@ -639,6 +639,10 @@ delete from ntc_bgp_as_cfg where compile_id=#{compileId} and function_id=#{functionId} + + delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId} + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , 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 ba5fd87f8..43820e5f7 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -135,10 +135,10 @@ public class BgpCfgService extends CrudService { areaIpCfgDao.saveAreaIpCfg(cfg); } } - } catch (Exception e) { + } catch (MaatConvertException e) { e.printStackTrace(); logger.info("获取编译ID出错"); - throw new MaatConvertException(":"+e.getMessage()); + throw new MaatConvertException(""); } }else{ @@ -146,9 +146,7 @@ public class BgpCfgService extends CrudService { //无效子配置后,再新增子配置 bgpCfgDao.deleteIpCfg(entity); bgpCfgDao.deleteBgpAsCfg(entity); - if(entity.getNtcSubscribeIdCfg()!=null){ - stringCfgDao.deleteSubscribeIdCfg(entity.getNtcSubscribeIdCfg()); - } + bgpCfgDao.deleteSubscribeIdCfg(entity); //TODO //bgpCfgDao.deleteDnsDomainCfg(entity); AreaIpCfg area = new AreaIpCfg(); diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index a7063e016..82353e08a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -32,6 +32,7 @@ $(".Wdate").attr("value",''); $("#level").attr("value",''); $("#searchForm")[0].reset(); + $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); }); //异步获取voip相关信息 $("span[id^=open]").click(function(){