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

音视频地址增加SubscribeId配置.

Browse Source
This commit is contained in:
zhangwenqing
2018-09-25 11:56:04 +08:00
parent f3aa74d164
commit 97de2d21db
18 changed files with 1247 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvContIpCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.domain.configuration.AvVoipIpCfg;
@@ -320,7 +321,7 @@ public class AvContentController extends BaseController {
@RequiresPermissions(value={"avContIp:config"})
public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response
,String ids,String compileIds
,@ModelAttribute("cfg")BaseIpCfg cfg
,BaseIpCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
@@ -383,6 +384,29 @@ public class AvContentController extends BaseController {
}
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId;
}
// 获取域配置信息
@RequestMapping(value = {"ajaxAvContIpList"})
public String ajaxAvContIpList(Model model,Long cfgId,Integer index) {
BaseIpCfg baseIpCfg = new BaseIpCfg();
baseIpCfg.setCfgId(cfgId);
BaseIpCfg cfg = avContentCfgService.getContIpCfgById(baseIpCfg);
List<String[]> tabList = new ArrayList();
tabList.add(new String[]{"1",cfg.getCfgType()});
if(cfg.getNtcSubscribeIdCfgList()!=null){
String cfgType = null;
for(BaseStringCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
if(!subscribeId.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",subscribeId.getCfgType()});
cfgType = subscribeId.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/av/subList";
}
/*****************************contIp业务***************/
/*****************************picIp业务***************/
@@ -402,7 +426,7 @@ public class AvContentController extends BaseController {
@RequiresPermissions(value={"avPicIp:config"})
public String picIpForm(Model model,HttpServletRequest request
,HttpServletResponse response,String ids
,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg
,String compileIds,BaseIpCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
@@ -465,6 +489,29 @@ public class AvContentController extends BaseController {
}
return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+functionId;
}
// 获取域配置信息
@RequestMapping(value = {"ajaxAvPicIpList"})
public String ajaxAvPicIpList(Model model,Long cfgId,Integer index) {
BaseIpCfg baseIpCfg = new BaseIpCfg();
baseIpCfg.setCfgId(cfgId);
BaseIpCfg cfg = avContentCfgService.getPicIpCfgById(baseIpCfg);
List<String[]> tabList = new ArrayList();
tabList.add(new String[]{"1",cfg.getCfgType()});
if(cfg.getNtcSubscribeIdCfgList()!=null){
String cfgType = null;
for(BaseStringCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
if(!subscribeId.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",subscribeId.getCfgType()});
cfgType = subscribeId.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/av/subList";
}
/*****************************picIp业务***************/
@@ -547,6 +594,29 @@ public class AvContentController extends BaseController {
}
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId;
}
// 获取域配置信息
@RequestMapping(value = {"ajaxAvContUrlList"})
public String ajaxAvContUrlList(Model model,Long cfgId,Integer index) {
BaseStringCfg baseStrCfg = new BaseStringCfg();
baseStrCfg.setCfgId(cfgId);
BaseStringCfg<NtcSubscribeIdCfg> cfg = avContentCfgService.getContUrlCfgById(baseStrCfg);
List<String[]> tabList = new ArrayList();
tabList.add(new String[]{"2",cfg.getCfgType()});
if(cfg.getNtcSubscribeIdCfgList()!=null){
String cfgType = null;
for(NtcSubscribeIdCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
if(!subscribeId.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",subscribeId.getCfgType()});
cfgType = subscribeId.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/av/subList";
}
/*****************************contUrl业务***************/
@@ -629,6 +699,29 @@ public class AvContentController extends BaseController {
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId;
}
// 获取域配置信息
@RequestMapping(value = {"ajaxAvPicUrlList"})
public String ajaxAvPicUrlList(Model model,Long cfgId,Integer index) {
BaseStringCfg baseStrCfg = new BaseStringCfg();
baseStrCfg.setCfgId(cfgId);
BaseStringCfg<NtcSubscribeIdCfg> cfg = avContentCfgService.getPicUrlCfgById(baseStrCfg);
List<String[]> tabList = new ArrayList();
tabList.add(new String[]{"2",cfg.getCfgType()});
if(cfg.getNtcSubscribeIdCfgList()!=null){
String cfgType = null;
for(NtcSubscribeIdCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
if(!subscribeId.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",subscribeId.getCfgType()});
cfgType = subscribeId.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/av/subList";
}
/*****************************picUrl业务***************/
/**
* 1、effectiveIds分组展示