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

VoIP ip配置修改

Browse Source
This commit is contained in:
leijun
2018-10-11 18:33:23 +08:00
parent aa6c1963e7
commit 97a06a9874
7 changed files with 250 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
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;
@@ -124,8 +125,8 @@ public class AvContentController extends BaseController {
@RequestMapping(value = {"/voipList"})
public String voipCfgList(Model model,HttpServletRequest request ,HttpServletResponse response ,@ModelAttribute("cfg")CfgIndexInfo entity
,RedirectAttributes redirectAttributes){
if(entity.getVoipIp()== null){
entity.setVoipIp(new AvVoipIpCfg());
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
if(entity.getVoipAccount()== null){
entity.setVoipAccount(new AvVoipAccountCfg());
@@ -283,7 +284,7 @@ public class AvContentController extends BaseController {
CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo);
List<String[]> tabList = new ArrayList();
//获取voipIpCfg信息
if(cfg.getVoipIps()!=null){
/* if(cfg.getVoipIps()!=null){
String cfgType = null;
for(AvVoipIpCfg ip:cfg.getVoipIps()){
if(!ip.getCfgType().equals(cfgType)){
@@ -291,7 +292,17 @@ public class AvContentController extends BaseController {
cfgType = ip.getCfgType();
}
}
}*/
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.getVoipAccounts()!=null){
String cfgType = null;
for(AvVoipAccountCfg account:cfg.getVoipAccounts()){
@@ -536,6 +547,9 @@ public class AvContentController extends BaseController {
,HttpServletResponse response
,@ModelAttribute("cfg")BaseStringCfg entity
,RedirectAttributes redirectAttributes){
if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg());
}
Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model,entity);