From a09341f8d7aac7e659ba2301f9b5381aae633b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Mon, 10 Dec 2018 20:23:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BD=ACurl=E9=85=8D=E7=BD=AEbug=E6=9B=B4=E6=94=B9=20=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=A4=B1=E6=95=88=E6=97=B6http=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E9=85=8D=E7=BD=AE=E5=A4=B1=E6=95=88=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=A4=B1=E6=95=88=E7=9B=B8=E5=85=B3=E7=9A=84httpurl?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E5=88=98=E6=A2=A6=E4=B8=A5=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E8=A1=8C=E4=B8=BA=E5=8F=AA=E4=BF=9D=E7=95=99pptp=20op?= =?UTF-8?q?envpn=20ipsec=20l2tp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/configuration/CommonPolicyDao.java | 4 ++ .../web/dao/configuration/CommonPolicyDao.xml | 23 +++++++++++ .../configuration/CommonPolicyService.java | 31 +++++++++++++++ .../sql/20181210/update_spec_service_cfg.sql | 1 + .../include/form/multiHttpUrlModal.jsp | 39 +++++++++---------- 5 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/sql/20181210/update_spec_service_cfg.sql diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java index cb23303aa..11cdc8e03 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java @@ -31,8 +31,12 @@ public interface CommonPolicyDao { public void deleteComplexStringCfg(CfgIndexInfo entity); public void updateCfgValid(BaseCfg entity); public void auditCfg(BaseCfg entity); + public List getHttpUrlCfgBySourceCompileId(@Param("compileIds")List compileIds); public void auditCfgBatch(@Param("tableName")String tableName, @Param("entity")BaseCfg baseCfg, @Param("compileIds")List compileIds, @Param("requestId")Integer requestId); + public void deleteHttpUrlCfg(@Param("tableName")String tableName, + @Param("entity")BaseCfg baseCfg, + @Param("compileIds")List compileIds); } diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml index d412b6166..326f79570 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -784,4 +784,27 @@ + + update ${tableName} set is_valid =-1,is_audit = 0, + editor_id = #{entity.auditorId,jdbcType=INTEGER}, + edit_time = #{entity.auditTime,jdbcType=TIMESTAMP} + + and compile_id in + + #{compileId} + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java index b6cac4255..ae8a584da 100644 --- a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java @@ -100,6 +100,37 @@ public class CommonPolicyService extends CrudService httpUrlCfgs=commonPolicyDao.getHttpUrlCfgBySourceCompileId(compileIds); + if(!StringUtil.isEmpty(httpUrlCfgs)) { + for (CfgIndexInfo httpUrlCfg: httpUrlCfgs) { + //审核通过的 + if(httpUrlCfg.getIsValid().equals(1) && httpUrlCfg.getIsAudit().equals(1)) { + auditHttpCompileIds.add(httpUrlCfg.getCompileId()); + maatCfg = new MaatCfg(); + maatCfg.setCompileId(httpUrlCfg.getCompileId()); + maatCfg.setServiceId(httpUrlCfg.getServiceId()); + maatCfg.setIsValid(0);//无效 + configCompileList.add(maatCfg); + } + //未审核或者审核未通过的 + if(httpUrlCfg.getIsValid().equals(0) && (httpUrlCfg.getIsAudit().equals(0) || httpUrlCfg.getIsAudit().equals(2))) { + deleteHttpCompileIds.add(httpUrlCfg.getCompileId()); + } + } + } + } + if(!StringUtil.isEmpty(auditHttpCompileIds)) { + commonPolicyDao.auditCfgBatch("cfg_index_info", entity,auditHttpCompileIds,null); + commonPolicyDao.auditCfgBatch("http_url_cfg", entity,auditHttpCompileIds,null); + } + if(!StringUtil.isEmpty(deleteHttpCompileIds)) { + commonPolicyDao.deleteHttpUrlCfg("cfg_index_info", entity,deleteHttpCompileIds); + commonPolicyDao.deleteHttpUrlCfg("http_url_cfg", entity,deleteHttpCompileIds); + } commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null); } diff --git a/src/main/resources/sql/20181210/update_spec_service_cfg.sql b/src/main/resources/sql/20181210/update_spec_service_cfg.sql new file mode 100644 index 000000000..6ffc26375 --- /dev/null +++ b/src/main/resources/sql/20181210/update_spec_service_cfg.sql @@ -0,0 +1 @@ +update specific_service_cfg set is_valid=0 where cfg_type=2 and is_Valid=1 and is_leaf = 0 and spec_service_code not in(10015,10019,10061,10013); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp b/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp index d35644bc2..e80448b2f 100644 --- a/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiHttpUrlModal.jsp @@ -50,73 +50,72 @@ $(function () { $("#httpUrl tbody tr").eq(i).find("td").eq(1).attr("title",urls[i]); $("#httpUrl tbody tr").eq(i).find("td").eq(1) .append(url); - $("#httpUrl tbody tr").eq(i).find("td").eq(2).append( - $("select[name='service']").clone() + $("#http_url_modal").find("select[name='service']").clone() .attr("name",prefixName+"action") .removeClass("hidden") ); $("#httpUrl tbody tr").eq(i).find("td").eq(2).append( - $("input[name='serviceId']").clone() + $("#http_url_modal").find("input[name='serviceId']").clone() .attr("name",prefixName+"serviceId") .attr("value","6") ); $("#httpUrl tbody tr").eq(i).find("td").eq(2).append( - $("input[name='cfgType']").clone() + $("#http_url_modal").find("input[name='cfgType']").clone() .attr("name",prefixName+"cfgType") ); $("#httpUrl tbody tr").eq(i).find("td").eq(2).append( - $("input[name='cfgRegionCode']").clone() + $("#http_url_modal").find("input[name='cfgRegionCode']").clone() .attr("name",prefixName+"cfgRegionCode") ); $("#httpUrl tbody tr").eq(i).find("td").eq(2).append( - $("input[name='serviceId']").clone() + $("#http_url_modal").find("input[name='serviceId']").clone() .attr("name",prefixName+"functionId") .attr("value","6") ); $("#httpUrl tbody tr").eq(i).find("td").eq(3).append( - $("select[name='doLog']").clone() + $("#http_url_modal").find("select[name='doLog']").clone() .attr("name",prefixName+"doLog") .removeClass("hidden") ); $("#httpUrl tbody tr").eq(i).find("td").eq(4).append( - $("select[name='exprType']").clone() + $("#http_url_modal").find("select[name='exprType']").clone() .attr("name",prefixName+"exprType") .removeClass("hidden") ); $("#httpUrl tbody tr").eq(i).find("td").eq(5).append( - $("select[name='matchMethod']").clone() + $("#http_url_modal").find("select[name='matchMethod']").clone() .attr("name",prefixName+"matchMethod") .removeClass("hidden") ); $("#httpUrl tbody tr").eq(i).find("td").eq(6).append( - $("input[name='isHexbin']").clone() + $("#http_url_modal").find("input[name='isHexbin']").clone() .attr("name",prefixName+"isHexbin") ); $("#httpUrl tbody tr").eq(i).find("td").eq(7).append( - $("input[name='requestId']").clone() + $("#http_url_modal").find("input[name='requestId']").clone() .attr("name",prefixName+"requestId") ); $("#httpUrl tbody tr").eq(i).find("td").eq(7).append( - $("input[name='classify']").clone() + $("#http_url_modal").find("input[name='classify']").clone() .attr("name",prefixName+"classify") ); $("#httpUrl tbody tr").eq(i).find("td").eq(7).append( - $("input[name='attribute']").clone() + $("#http_url_modal").find("input[name='attribute']").clone() .attr("name",prefixName+"attribute") ); $("#httpUrl tbody tr").eq(i).find("td").eq(7).append( - $("input[name='lable']").clone() + $("#http_url_modal").find("input[name='lable']").clone() .attr("name",prefixName+"lable") ); $("#httpUrl tbody tr").eq(i).find("td").eq(8).append( - $("input[name='isAreaEffective']").clone() + $("#http_url_modal").find("input[name='isAreaEffective']").clone() .attr("name",prefixName+"isAreaEffective") ); $("#httpUrl tbody tr").eq(i).find("td").eq(9).append( - $("input[name='sourceCompileId']").clone() + $("#http_url_modal").find("input[name='sourceCompileId']").clone() .attr("name",prefixName+"sourceCompileId") .attr("value",compileIds[i]) ); @@ -128,9 +127,9 @@ $(function () { }); } - $("select").selectpicker("refresh"); + $("#http_url_modal").find("select").selectpicker("refresh"); - $("select[name$='.action']").each(function(){ + $("#http_url_modal").find("select[name$='.action']").each(function(){ var action=$(this).val(); var objNamePrefix=$(this).attr("name").split("action")[0]; $(this).on("change", function() { @@ -142,7 +141,7 @@ $(function () { $("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val()); $("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode")); } - if(action == 1){ //白名单 + if(action == 1){ $("select[name='"+objNamePrefix+"doLog']").attr("value",1); $("select[name='"+objNamePrefix+"doLog']").attr("disabled",true); $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh"); @@ -159,7 +158,7 @@ $(function () { $("input[name='"+objNamePrefix+"cfgType']").attr("value",$("#httpUrlRegion").val()); $("input[name='"+objNamePrefix+"cfgRegionCode']").attr("value",$("#httpUrlRegion").attr("cfgRegionCode")); } - if(action == 1){ //白名单 + if(action == 1){ $("select[name='"+objNamePrefix+"doLog']").attr("value",1); $("select[name='"+objNamePrefix+"doLog']").attr("disabled",true); $("select[name='"+objNamePrefix+"doLog']").selectpicker("refresh");