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

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