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

Stream Media 域配置

Browse Source 
NTC_STREAM_MEDIA_URL
NTC_ SUBSCRIBE_ID
NTC_UNIVERSAL_IP[protocol_id=23]
NTC_UNIVERSAL_PROTO_TYPE
This commit is contained in:
leijun
2018-10-12 19:31:16 +08:00
parent c5130454f1
commit cb2ce6f8ba
10 changed files with 1102 additions and 512 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

@@ -24,6 +24,7 @@ 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.AvContUrlCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
@@ -545,12 +546,18 @@ public class AvContentController extends BaseController {
@RequestMapping(value = {"/contUrlList"})
public String contUrlList(Model model,HttpServletRequest request
,HttpServletResponse response
,@ModelAttribute("cfg")BaseStringCfg entity
,@ModelAttribute("cfg")CfgIndexInfo entity
,RedirectAttributes redirectAttributes){
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
if(entity.getAvContUrlCfgList()== null){
entity.setAvContUrlCfg(new AvContUrlCfg());;
}
if(entity.getNtcSubscribeIdCfg()==null){
entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
}
Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model,entity);
return "/cfg/av/contUrl/contUrlList";
@@ -558,15 +565,25 @@ public class AvContentController extends BaseController {
//音视频CONTUrl新增界面
@RequestMapping(value = {"/contUrlForm"})
@RequiresPermissions(value={"avContUrl:config"})
public String contUrlForm(Model model,HttpServletRequest request
,HttpServletResponse response,String ids,String compileIds
,@ModelAttribute("cfg")BaseStringCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getContUrlCfgById(cfg);
public String contUrlForm(Model model,HttpServletRequest request ,HttpServletResponse response
,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(ids)){
cfg.setCfgId(Long.parseLong(ids));
cfg = avContentCfgService.getUrlCfgIndexInfo(cfg);
AvContUrlCfg urlCfg = new AvContUrlCfg();
urlCfg.setCfgType("NTC_STREAMING_MEDIA_URL");
cfg.setAvContUrlCfg(urlCfg);
if(cfg.getAvContUrlCfgList().size()==0){
cfg.getAvContUrlCfgList().add(urlCfg);
}
initUpdateFormCondition(model, cfg);
}else{
AvContUrlCfg urlCfg = new AvContUrlCfg();
urlCfg.setCfgType("NTC_STREAMING_MEDIA_URL");
cfg.setAvContUrlCfg(urlCfg);
List<AvContUrlCfg> urlList=new ArrayList<AvContUrlCfg>();
urlList.add(urlCfg);
cfg.setAvContUrlCfgList(urlList);
initFormCondition(model,cfg);
}
model.addAttribute("_cfg", cfg);
@@ -575,19 +592,22 @@ public class AvContentController extends BaseController {
//保存CONTUrl信息
@RequestMapping(value = {"/saveContUrl"})
public String saveContUrl(Model model,HttpServletRequest request
,HttpServletResponse response,
@ModelAttribute("cfg")BaseStringCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds
,RedirectAttributes redirectAttributes){
public String saveContUrl(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
try{
avContentCfgService.saveOrUpdateContUrl(cfg,areaCfgIds);
avContentCfgService.saveOrUpdateContUrl(cfg);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed");
}else {
e.printStackTrace();
logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
}
@@ -606,8 +626,8 @@ public class AvContentController extends BaseController {
public String auditContUrl(Integer isAudit,Integer isValid,String ids
,String compileIds,Integer functionId
, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -625,25 +645,44 @@ public class AvContentController extends BaseController {
// 获取域配置信息
@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);
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
cfgIndexInfo.setCfgId(cfgId);
CfgIndexInfo cfg = avContentCfgService.getUrlCfgIndexInfo(cfgIndexInfo);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
for(IpPortCfg ip:cfg.getIpPortList()){
if(!ip.getCfgType().equals(cfgType)){
tabList.add(new String[]{"1",ip.getCfgType()});
cfgType = ip.getCfgType();
}
}
}
if(cfg.getAvContUrlCfgList()!=null){
String cfgType = null;
for(AvContUrlCfg avContUrlCfg:cfg.getAvContUrlCfgList()){
if(!avContUrlCfg.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",avContUrlCfg.getCfgType()});
cfgType = avContUrlCfg.getCfgType();
}
}
}
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();
for(NtcSubscribeIdCfg ntc:cfg.getNtcSubscribeIdCfgList()){
if(!ntc.getCfgType().equals(cfgType)){
tabList.add(new String[]{"2",ntc.getCfgType()});
cfgType = ntc.getCfgType();
}
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
return "/cfg/av/subList";
return "/cfg/av/contUrl/contSubList";
}
/*****************************contUrl业务***************/