diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index f77e350af..bc7c7eab3 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -30,7 +30,10 @@ public class FileDigestCfg extends BaseCfg { private String digest; private Integer cfdsLevel; private String fileUrl; - + + private NtcSubscribeIdCfg ntcSubscribeIdCfg; + private List ntcSubscribeIdCfgList; + public static String getTablename() { return tableName; } @@ -61,5 +64,17 @@ public class FileDigestCfg extends BaseCfg { public void setFileUrl(String fileUrl) { this.fileUrl = fileUrl; } + public NtcSubscribeIdCfg getNtcSubscribeIdCfg() { + return ntcSubscribeIdCfg; + } + public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcSubscribeIdCfg) { + this.ntcSubscribeIdCfg = ntcSubscribeIdCfg; + } + public List getNtcSubscribeIdCfgList() { + return ntcSubscribeIdCfgList; + } + public void setNtcSubscribeIdCfgList(List ntcSubscribeIdCfgList) { + this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 491dff836..0f116ffde 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -225,7 +225,7 @@ public class FileTransferCfgController extends BaseController{ entity.setCreateTime(date); fileTime=entity.getCreateTime(); } - ToMaatResult result = null; + ToMaatResult result = new ToMaatResult(); if(file!=null && file.getSize()>0 && entity!=null){ String sep = System.getProperty("file.separator"); String digestFilePath = request.getRealPath("/")+"digestFile"; @@ -245,6 +245,9 @@ public class FileTransferCfgController extends BaseController{ String md5 = DigestUtils.md5Hex(file.getBytes()); fileMap.put("checksum", md5); result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap)); + if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) { + throw new MaatConvertException(":"+null); + } logger.info("获取文件摘要响应信息:"+result); } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); @@ -282,6 +285,25 @@ public class FileTransferCfgController extends BaseController{ } return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId; } + @RequestMapping(value = {"ajaxFileDigestSubIdList"}) + public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index) { + FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId); + List tabList = new ArrayList(); + //查询SubscribeId域配置 + if(cfg.getNtcSubscribeIdCfgList()!=null){ + String cfgType = null; + for(NtcSubscribeIdCfg ntc:cfg.getNtcSubscribeIdCfgList()){ + if(!ntc.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"2",ntc.getCfgType()}); + cfgType = ntc.getCfgType(); + } + } + } + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/fileTransfer/fileDigestSubList"; + } @RequestMapping(value = {"p2pList"}) public String p2pList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index eda6c05f5..61ce32148 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -1508,7 +1508,7 @@ , #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER} ,#{userRegion1,jdbcType=VARCHAR} ,#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR} - ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} + ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} ,#{doLog,jdbcType=INTEGER} ) diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java index e43bc8ca3..297a8b4e7 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java @@ -38,6 +38,8 @@ public interface FileTransferCfgDao extends CrudDao { public void auditCfg(BaseCfg entity); public FileDigestCfg getFileDigest(Long id); public void updateFileDigestCfg(FileDigestCfg entity); + public void deleteFileDigestSubscribeIdCfg(FileDigestCfg entity); + public List getFileDigestSubscribeidList(FileDigestCfg entity); // P2P域配置新增 public void saveP2pHashCfg(BaseStringCfg cfg); @@ -53,4 +55,5 @@ public interface FileTransferCfgDao extends CrudDao { public void deleteP2pHashCfg(CfgIndexInfo entity); public void deleteP2pKeywordCfg(CfgIndexInfo entity); public void deleteP2pSubscribeIdCfg(CfgIndexInfo entity); + } diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml index 9140f8307..21f48b1cb 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml @@ -1051,11 +1051,14 @@ delete from p2p_keyword_cfg where compile_id=#{compileId} and function_id=#{functionId} - + delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId} - + + + delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId} + + + update file_digest_cfg 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 09eb8ee34..f0b8dcabd 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -378,6 +378,8 @@ public class FileTransferCfgService extends CrudService subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity); + entity.setNtcSubscribeIdCfgList(subscribeidList); return entity; } @@ -402,18 +404,21 @@ public class FileTransferCfgService extends CrudService:"+null); - } + entity.setRawLen(result.getData().getRawLen()); + entity.setDigest(result.getData().getDigest()); + entity.setFileUrl(result.getData().getAccessUrl()); + mailCfgDao.saveMailFileDigestCfg(entity); + // 保存SubscribeId域配置信息 + if(entity.getNtcSubscribeIdCfgList()!=null){ + for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ + if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + fileTransferCfgDao.saveP2pSubscribeIdCfg(cfg); + } + } + } //保存区域IP信息 if(entity.getAreaCfg()!=null&&entity.getAreaCfg().size()>0){ for (AreaIpCfg areaIpCfg : entity.getAreaCfg()) { @@ -427,12 +432,26 @@ public class FileTransferCfgService extends CrudService ntcList = stringCfgDao.findSubscribeIdCfgList(ntcSubscribeIdCfg); + entity.setNtcSubscribeIdCfgList(ntcList); + } + return entity; + } + public Page getP2pList(Page page, CfgIndexInfo entity){ // 生成数据权限过滤条件(dsf为dataScopeFilter的简写,在xml中使用 ${sqlMap.dsf}调用权限SQL) entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); @@ -943,4 +973,5 @@ public class FileTransferCfgService extends CrudService", ""); + return; + } $("input[name$='cfgKeywords']").each(function(){ if($(this).val()==''){ $(this).parents(".form-group").find( @@ -65,7 +80,6 @@ $(function(){ if($("input[name='ratelimit']").is(":hidden")){ $("input[name='ratelimit']").val(""); } - /* $("#appCode").val($("#specServiceIdId").val()); */ loading('onloading...'); form.submit(); }else{ @@ -175,8 +189,9 @@ var delContent = function(contentClassName, addBtnClassName) { + - +
@@ -273,6 +288,49 @@ var delContent = function(contentClassName, addBtnClassName) {
+ +
+ + +

+ + +

+ + + + + + + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+ + +
+
+
+ + + + +
+ + + + +
+
+
+

@@ -301,6 +359,7 @@ var delContent = function(contentClassName, addBtnClassName) { + <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index ed64e8944..2629f699a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -13,34 +13,89 @@ }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); + $("#protocolId").val($(this).attr("protocolId")); }); $("#serviceId").val($(".action:checked").attr("serviceId")); - $("#cfgFrom").validate( - { - submitHandler : function(form) { - /* var srcFile = $("#srcFile").val(); - var srcUrl = $("#srcUrl").val(); - if((srcUrl==null||srcUrl=="") && (srcFile==null || srcFile=="")){ - $("div[for='srcFile']").append(""); - return false; - }else{ - } */ - loading('onloading...'); - form.submit(); - - }, - errorContainer : "#messageBox", - errorPlacement : function(error, element) { - $(element).parents(".form-group").find( - "div[for='" + element.attr("name") + "']") - .append(error); - }, + $("#protocolId").val($(".action:checked").attr("protocolId")); + $("#cfgFrom").validate({ + errorPlacement: function(error,element){ + if($(element).parents().hasClass("tagsinput")){ + $(element).parents(".col-md-6").next("div").append(error); + }else{ + $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); + } + }, + submitHandler : function(form) { + var flag = true; + //代表所有业务都隐藏了,提示必须增加一种业务数据 + if($(".boxSolid").length ==$(".boxSolid.hidden").length){ + top.$.jBox.tip("", ""); + return; + } + $("input[name$='cfgKeywords']").each(function(){ + if($(this).val()==''){ + $(this).parents(".form-group").find( + "div[for='" + + $(this).attr("name") + + "']").html(""); + flag = false; + } + }) + $("select[name$='isHexbin']").each(function(){ + var isHexbin=$(this).val(); + if(isHexbin == 1){ //十六进制 + var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ + $(this).parents(".form-body").find( + "div[for='" + + $(this).attr("name").replace("isHexbin","cfgKeywords") + + "']").html(""); + flag = false; + } + } }); + if(flag){ + //将disable属性的元素删除 + $(".disabled").each(function(){ + $(this).remove(); + }); + $("input[name$='exprType']").attr("disabled",false); + if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ + $("input[name$='exprType']").val(1); + } + loading('onloading...'); + form.submit(); + }else{ + return; + } + + }, + errorContainer : "#messageBox", + errorPlacement : function(error, element) { + $(element).parents(".form-group").find( + "div[for='" + element.attr("name") + "']") + .append(error); + }, + }); }); + //业务窗口打开 + var addContent = function(obj, contentClassName) { + var showDiv = $(obj).parent().parent().next(); + $(showDiv).removeClass("hidden").removeClass( + "disabled"); + $(obj).addClass("hidden"); + } + + //业务窗口关闭 + var delContent = function(contentClassName, addBtnClassName) { + $("." + contentClassName).addClass("hidden").addClass("disabled"); + $("." + addBtnClassName).removeClass("hidden"); + } - + +

@@ -183,6 +238,49 @@

+ + + + + +

+ + +

+ + + + + + + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+ + +
+
+
+ + + + +
+ + + + +
+
+
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%> <%@include file="/WEB-INF/include/form/basicInfo.jsp"%> diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index e2c89c8ae..cd699b878 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -36,6 +36,51 @@ $("#level").attr("value",''); $("#searchForm")[0].reset(); }); + //异步获取voip相关信息 + $("span[id^=open]").click(function(){ + var openId=$(this).attr("id"); + var closeId=$(this).attr("id").replace("open","close"); + var index=$(this).attr("id").replace("open",""); + $("#"+openId).hide(); + $("#"+closeId).show(); + //var compileId=$(this).attr("compileId"); + var cfgId=$(this).attr("cfgId"); + if($("#"+openId).parent().parent().next("tr").hasClass("child")){ + $("#"+openId).parent().parent().next("tr").show(); + }else{ + $.ajax({ + type:'post', + async:false, + url:'${ctx}/ntc/fileTransfer/ajaxFileDigestSubIdList', + data:{"cfgId":cfgId,"index":index}, + dataType:"html", + success:function(data){ + var subTab=""+ + ""+ + ""+ + ""+ + ""; + var html=""; + html+="
"; + html = html+data; + subTab=subTab+html; + subTab+=""; + subTab+=""; + $("#"+openId).parent().parent().after(subTab); + $("div[name='tabTitle"+index+"']").get(0).click(); + } + }); + } + + }); + + $("span[id^=close]").on("click",function(){ + var closeId=$(this).attr("id"); + var openId=$(this).attr("id").replace("close","open"); + $("#"+closeId).hide(); + $("#"+openId).show(); + $("#"+closeId).parent().parent().next("tr").hide(); + }); }); @@ -289,6 +334,7 @@ + ${indexCfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp new file mode 100644 index 000000000..6d2d6a00c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp @@ -0,0 +1,79 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ + +
+
+ +
+ + + + +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+ \ No newline at end of file