diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index ef2c5770c..a0fc4eaae 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -37,9 +37,7 @@ import com.nis.domain.configuration.AppPolicyCfg; import com.nis.domain.configuration.AppSslCertCfg; import com.nis.domain.configuration.AppTcpCfg; import com.nis.domain.configuration.AppTopicDomainCfg; -import com.nis.domain.configuration.AvFileSampleCfg; import com.nis.domain.configuration.BaseStringCfg; -import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.WebsiteDomainTopic; @@ -77,38 +75,58 @@ public class AppCfgController extends BaseController { public String policyCfgList(Model model,@ModelAttribute("cfg")AppPolicyCfg cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"r"); Page page = appCfgService.findAppPolicyList(searchPage, cfg); - for(AppPolicyCfg entity:page.getList()){ - SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - if(app!=null) { - entity.setAppName(app.getSpecServiceName()); - } - } +// for(AppPolicyCfg entity:page.getList()){ +// SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); +// if(app!=null) { +// entity.setAppName(app.getSpecServiceName()); +// } +// } //查找社交应用的所有有效二级特定服务 - SpecificServiceCfg second=new SpecificServiceCfg(); - for(SysDataDictionaryItem dict:DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { - if(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) { - second.setCfgType(Integer.parseInt(dict.getItemCode())); - break; - } - } - second.setIsValid(Constants.VALID_YES); - second.setIsLeaf(1); - List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); +// SpecificServiceCfg second=new SpecificServiceCfg(); +// second.setCfgType(1); +// second.setIsValid(Constants.VALID_YES); +// second.setIsLeaf(1); +// List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); + //遍历,找到匹配项后将行为设置进去 - for(AppPolicyCfg entity:page.getList()){ - if(entity.getBehavCode()==null) continue; - for(SpecificServiceCfg secondCfg:secondList) { - if(secondCfg.getSpecServiceCode()==null) continue; - if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { - entity.setBehavName(secondCfg.getSpecServiceName()); - break; - } - } - } +// for(AppPolicyCfg entity:page.getList()){ +// if(entity.getBehavCode()==null) continue; +// for(SpecificServiceCfg secondCfg:secondList) { +// if(secondCfg.getSpecServiceCode()==null) continue; +// if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { +// entity.setBehavName(secondCfg.getSpecServiceName()); +// break; +// } +// } +// } model.addAttribute("page", page); initPageCondition(model,cfg); return "/cfg/app/appPolicyCfgList"; } + /** + * ajax设置Name + * @param model + * @param ids + * @return + */ + @RequestMapping(value="ajaxAppName",method=RequestMethod.POST) + @ResponseBody + public List> ajaxAppName(Model model,String ids){ + List> dataList=new ArrayList<>(); + List serviceList=specificServiceCfgService.getBySpecServiceCodes(ids); + Map appMap=new HashMap<>(); + Map behavMap=new HashMap<>(); + for(SpecificServiceCfg cfg:serviceList) { + if(cfg.getIsLeaf().intValue()==0) { + appMap.put(cfg.getSpecServiceCode().toString(), cfg.getSpecServiceName()); + }else { + behavMap.put(cfg.getSpecServiceCode().toString(), cfg.getSpecServiceName()); + } + } + dataList.add(appMap); + dataList.add(behavMap); + return dataList; + } /** * 查询APP策略IP子配置 * @param model diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index b471eefa2..2a23b0d9f 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -52,13 +52,13 @@ public class BasicProtocolController extends BaseController { public String policyCfgList(Model model,@ModelAttribute("cfg")AppPolicyCfg cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"r"); Page page = appCfgService.findAppPolicyList(searchPage, cfg); - for(AppPolicyCfg entity:page.getList()){ - SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - if(app!=null) { - entity.setAppName(app.getSpecServiceName()); - } - - } +// for(AppPolicyCfg entity:page.getList()){ +// SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); +// if(app!=null) { +// entity.setAppName(app.getSpecServiceName()); +// } +// +// } model.addAttribute("page", page); initPageCondition(model,cfg); return "/cfg/basicprotocol/list"; diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index bd74540a9..e58eef02e 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -15,6 +15,8 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; @@ -51,34 +53,34 @@ public class EncryptedTunnelBehaviorController extends BaseController { public String policyCfgList(Model model,@ModelAttribute("cfg")AppPolicyCfg cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"r"); Page page = appCfgService.findAppPolicyList(searchPage, cfg); - for(AppPolicyCfg entity:page.getList()){ - SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - if(app!=null) { - entity.setAppName(app.getSpecServiceName()); - } - } - //查找社交应用的所有有效二级特定服务 - SpecificServiceCfg second=new SpecificServiceCfg(); - for(SysDataDictionaryItem dict:DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { - if(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) { - second.setCfgType(Integer.parseInt(dict.getItemCode())); - break; - } - } - second.setIsValid(Constants.VALID_YES); - second.setIsLeaf(1); - List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); - //遍历,找到匹配项后将行为设置进去 - for(AppPolicyCfg entity:page.getList()){ - if(entity.getBehavCode()==null) continue; - for(SpecificServiceCfg secondCfg:secondList) { - if(secondCfg.getSpecServiceCode()==null) continue; - if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { - entity.setBehavName(secondCfg.getSpecServiceName()); - break; - } - } - } +// for(AppPolicyCfg entity:page.getList()){ +// SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); +// if(app!=null) { +// entity.setAppName(app.getSpecServiceName()); +// } +// } +// //查找社交应用的所有有效二级特定服务 +// SpecificServiceCfg second=new SpecificServiceCfg(); +// for(SysDataDictionaryItem dict:DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { +// if(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) { +// second.setCfgType(Integer.parseInt(dict.getItemCode())); +// break; +// } +// } +// second.setIsValid(Constants.VALID_YES); +// second.setIsLeaf(1); +// List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); +// //遍历,找到匹配项后将行为设置进去 +// for(AppPolicyCfg entity:page.getList()){ +// if(entity.getBehavCode()==null) continue; +// for(SpecificServiceCfg secondCfg:secondList) { +// if(secondCfg.getSpecServiceCode()==null) continue; +// if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { +// entity.setBehavName(secondCfg.getSpecServiceName()); +// break; +// } +// } +// } model.addAttribute("page", page); initPageCondition(model,cfg); return "/cfg/encryptedtunnelbehav/list"; diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java index 5bece65be..5cb21f222 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java @@ -18,6 +18,7 @@ public interface SpecificServiceCfgDao extends CrudDao { * @return */ SpecificServiceCfg getBySpecServiceId(Integer specServiceId); + List getBySpecServiceCodes(@Param("ids")String ids); /** * 查询所有符合条件顶层分页列表 * @param specificServiceCfg diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml index 9d00b2bd1..3441dc29e 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml @@ -41,6 +41,10 @@ select from specific_service_cfg s where s.spec_service_id = #{specServiceId} + ' + +''; + if(data.length>0){ + for(i=0;i'; + } + html+=''; + $("#behaviorId").html(html); + $("[name='behaviorId']").selectpicker("refresh"); + $("[name='behaviorId']").selectpicker("render"); + }else{ + html+=''; + $("#behaviorId").html(html); + $("[name='behaviorId']").selectpicker("refresh"); + $("[name='behaviorId']").selectpicker("render"); + } + + } + }, + complete:function(XMLHttpRequest,status){//超时设置 + if(status=="timeout"){ + var html=''; + $("#behaviorId").html(html); + $("[name='behaviorId']").selectpicker("refresh"); + $("[name='behaviorId']").selectpicker("render"); + } + } + }); +} +//导入配置 +var importCfg=function(){ + if($("#serviceId").val()==""){ + alert("请选择action"); + return ; + } + var appFlag=true; + if(($("#functionId").val() == 63)||($("#functionId").val() == 408)||($("#functionId").val() == 407)){ + var appIdValue=$("#appIdName").val(); + if(appIdValue == null || appIdValue ==''){ + appFlag=false; + } + } + var fileName = $(".fileupload-preview", $("#importForm1")).text(); + var $error = $('.alert-error', $("#importForm1")); + if(!appFlag){ + $("span",$error).html($("#appError").val()); + $error.removeClass("hide"); + $error.addClass("show"); + return false; + } + + if(fileName==""){ + $("span",$error).html($("#importTip").val()); + $error.removeClass("hide"); + $error.addClass("show"); + return false; + + }else if(fileName.lastIndexOf("\.")==-1||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xls' &&fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xlsx'){ + $("span",$error).html($("#importTip").val()); + $error.removeClass("hide"); + $error.addClass("show"); + return false; + } + $("#import_modal").modal('hide');//导入文件隐藏 + $("#importForm1").submit(); +} \ No newline at end of file