diff --git a/src/main/java/com/nis/domain/configuration/AreaBean.java b/src/main/java/com/nis/domain/configuration/AreaBean.java index 92a982f38..862966356 100644 --- a/src/main/java/com/nis/domain/configuration/AreaBean.java +++ b/src/main/java/com/nis/domain/configuration/AreaBean.java @@ -18,6 +18,8 @@ package com.nis.domain.configuration; public class AreaBean { private String area; private String isp; + private String areaName; + private String ispName; /** * area * @return area @@ -46,4 +48,17 @@ public class AreaBean { public void setIsp(String isp) { this.isp = isp; } + public String getAreaName() { + return areaName; + } + public void setAreaName(String areaName) { + this.areaName = areaName; + } + public void setIspName(String ispName) { + this.ispName = ispName; + } + public String getIspName() { + return ispName; + } + } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 84000dbb9..b2d8fa8a8 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3,7 +3,9 @@ import java.beans.PropertyEditorSupport; import java.io.IOException; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; @@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.ui.Model; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; @@ -24,9 +28,12 @@ import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.SysDictInfo; import com.nis.domain.configuration.AreaBean; import com.nis.domain.configuration.AreaIpCfg; +import com.nis.domain.configuration.AvVoipAccountCfg; +import com.nis.domain.configuration.AvVoipIpCfg; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.RequestInfo; @@ -358,31 +365,7 @@ public class BaseController { //从区域生效ID中获取区域与运营商 String areaEffectiveIds=cfg.getAreaEffectiveIds(); List areaIspList=new ArrayList(); - //areaEffectiveIds : 存在冒号,则冒号前为area后为isp;不存在冒号,判断id是否为isp,否则为area - if(StringUtils.isNotBlank(areaEffectiveIds)){ - String[] areaIsps=areaEffectiveIds.split(","); - for(String areaIsp:areaIsps){ - AreaBean area=new AreaBean(); - if(areaIsp.contains(":")){ - area.setArea(areaIsp.split(":")[0]); - area.setIsp(areaIsp.split(":")[1]); - }else{ - boolean isIsp=false; - for (SysDictInfo ispDict : isps) { - if(ispDict.getItemCode().equals(areaIsp)){ - area.setIsp(areaIsp); - isIsp=true; - break; - } - } - if(!isIsp){ - area.setArea(areaIsp); - } - - } - areaIspList.add(area); - } - } + getAreaIsps(areaEffectiveIds,areaIspList,isps,areas); model.addAttribute("_areaIsps", areaIspList); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); @@ -400,4 +383,43 @@ public class BaseController { @Deprecated protected void setSaveOrUpdateProps(Model model,BaseCfg cfg,String areaCfgIds) throws Exception{ } + + + public List getAreaIsps(String areaEffectiveIds,List areaIspList,List isps,List areas) { + Map areaMap=new HashMap(); + for (SysDictInfo areaDict : areas) { + areaMap.put(areaDict.getItemCode(), areaDict); + } + Map ispMap=new HashMap(); + for (SysDictInfo ispDict : isps) { + ispMap.put(ispDict.getItemCode(), ispDict); + } + + // : 存在冒号,则冒号前为area后为isp;不存在冒号,判断id是否为isp,否则为area + if(StringUtils.isNotBlank(areaEffectiveIds)){ + String[] areaIsps=areaEffectiveIds.split(","); + for(String areaIsp:areaIsps){ + AreaBean area=new AreaBean(); + if(areaIsp.contains(":")){ + area.setArea(areaIsp.split(":")[0]); + area.setIsp(areaIsp.split(":")[1]); + area.setAreaName(areaMap.get(areaIsp.split(":")[0]).getItemValue()); + area.setIspName(ispMap.get(areaIsp.split(":")[1]).getItemValue()); + }else{ + if(ispMap.keySet().contains(areaIsp)){ + area.setIsp(areaIsp); + area.setIspName(ispMap.get(areaIsp).getItemValue()); + area.setAreaName(""); + }else{ + area.setArea(areaIsp); + area.setIspName(""); + area.setAreaName(areaMap.get(areaIsp).getItemValue()); + } + + } + areaIspList.add(area); + } + } + return areaIspList; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index bfc56bdf6..daf597c89 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.nis.domain.Page; +import com.nis.domain.basics.SysDictInfo; +import com.nis.domain.configuration.AreaBean; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AvContIpCfg; import com.nis.domain.configuration.AvVoipAccountCfg; @@ -24,6 +27,7 @@ import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.AvVoipIpCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; +import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; @@ -393,4 +397,32 @@ public class AvContentController extends BaseController { return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId; } /*****************************picUrl业务***************/ + + /** + * 1、effectiveIds分组展示 + * 2、无effectiveIds查询area_ip,根据compileId查询展示 + */ + @ResponseBody + @RequestMapping(value = "/ajaxAreaEffictiveInfo") + public Map ajaxAreaEffictiveInfo(String areaEffectiveIds,Integer compileId) { + Map data=new HashMap(); + + List areaIsps=new ArrayList(); + List areaIps=new ArrayList(); + if(StringUtils.isEmpty(areaEffectiveIds)){ + areaIps=ipCfgService.getAreaCfgByCompileId(compileId); + }else{ + List itTypeList=new ArrayList(); + itTypeList.add(Constants.ITEM_TYPE_AREA); + List areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null); + itTypeList.clear(); + itTypeList.add(Constants.ITEM_TYPE_ISP); + List isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null); + getAreaIsps(areaEffectiveIds, areaIsps, isps, areas); + + } + data.put("areaIsps", areaIsps); + data.put("areaIps", areaIps); + return data; + } } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 0f69a56df..122cf0047 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -343,7 +343,11 @@ - + + + + + ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index fea715776..2515aa737 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -329,7 +329,11 @@ - + + + + + ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 39e65020f..176a775d3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -343,7 +343,11 @@ - + + + + + ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 466916cad..450a93b1d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -329,7 +329,11 @@ - + + + + + ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 6a7a6b4d1..ea0ee5b66 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -194,10 +194,10 @@ html+=""; html+="