gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加查看区域信息公共方法ajaxAreaEffictiveInfo

Browse Source 
修改contIp、contUrl、picUrl、picIp、voip列表中的区域ip
This commit is contained in:
duandongmei
2018-06-05 17:52:26 +08:00
parent 8adaa4a9ec
commit 2b93917c27
13 changed files with 252 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/domain/configuration/AreaBean.java
View File

@@ -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;
}
}

72
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -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<AreaBean> areaIspList=new ArrayList<AreaBean>();
//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<RequestInfo> 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<AreaBean> getAreaIsps(String areaEffectiveIds,List<AreaBean> areaIspList,List<SysDictInfo> isps,List<SysDictInfo> areas) {
Map<String, SysDictInfo> areaMap=new HashMap<String, SysDictInfo>();
for (SysDictInfo areaDict : areas) {
areaMap.put(areaDict.getItemCode(), areaDict);
}
Map<String, SysDictInfo> ispMap=new HashMap<String, SysDictInfo>();
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;
}
}

32
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -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<String, Object> data=new HashMap<String, Object>();
List<AreaBean> areaIsps=new ArrayList<AreaBean>();
List<AreaIpCfg> areaIps=new ArrayList<AreaIpCfg>();
if(StringUtils.isEmpty(areaEffectiveIds)){
areaIps=ipCfgService.getAreaCfgByCompileId(compileId);
}else{
List<Integer> itTypeList=new ArrayList<Integer>();
itTypeList.add(Constants.ITEM_TYPE_AREA);
List<SysDictInfo> areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
itTypeList.clear();
itTypeList.add(Constants.ITEM_TYPE_ISP);
List<SysDictInfo> isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
getAreaIsps(areaEffectiveIds, areaIsps, isps, areas);
}
data.put("areaIsps", areaIsps);
data.put("areaIps", areaIps);
return data;
}
}