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

contip、conturl、picip、picurl功能提交

Browse Source 
areainfo界面区域和运营商修改为二选一的
This commit is contained in:
duandongmei
2018-06-01 18:13:07 +08:00
parent 169c559a53
commit e80f2e2967
22 changed files with 2241 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,6 +333,15 @@ public class BaseController {
}
}
protected void initUpdateFormCondition(Model model,BaseCfg cfg){
List<Integer> itTypeList=new ArrayList<Integer>();
itTypeList.add(Constants.ITEM_TYPE_AREA);
List<SysDictInfo> areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
model.addAttribute("areas", areas);
itTypeList.clear();
itTypeList.add(Constants.ITEM_TYPE_ISP);
List<SysDictInfo> isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
model.addAttribute("isps", isps);
//查询配置对应的地域ip
List<AreaIpCfg> areaCfgs=ipCfgService.getAreaCfgByCompileId(cfg.getCompileId());
model.addAttribute("areaCfgs", areaCfgs);
@@ -349,6 +358,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){
@@ -357,7 +367,18 @@ public class BaseController {
area.setArea(areaIsp.split(":")[0]);
area.setIsp(areaIsp.split(":")[1]);
}else{
area.setArea(areaIsp);
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);
}
@@ -371,14 +392,6 @@ public class BaseController {
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findAllLableDict();
model.addAttribute("lables", lables);
List<Integer> itTypeList=new ArrayList<Integer>();
itTypeList.add(Constants.ITEM_TYPE_AREA);
List<SysDictInfo> areas = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
model.addAttribute("areas", areas);
itTypeList.clear();
itTypeList.add(Constants.ITEM_TYPE_ISP);
List<SysDictInfo> isps = sysDictInfoService.findAllSysDictInfo(new SysDictInfo(),itTypeList,null);
model.addAttribute("isps", isps);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
model.addAttribute("regionList", regionList);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());

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

@@ -23,6 +23,7 @@ import com.nis.domain.configuration.AvVoipAccountCfg;
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.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -137,7 +138,7 @@ public class AvContentController extends BaseController {
/*****************************contIp业务***************/
//视频文本内容配置列表
@RequestMapping(value = {"/contentIpList"})
@RequestMapping(value = {"/contIpList"})
public String contIpList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseIpCfg entity){
Page<BaseIpCfg> page = avContentCfgService.findContIpPage(new Page<BaseIpCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
@@ -145,8 +146,8 @@ public class AvContentController extends BaseController {
return "/cfg/av/contIp/contIpList";
}
//音视频CONTIP新增界面
@RequestMapping(value = {"/contentIpForm"})
@RequiresPermissions(value={"avContentIp:config"})
@RequestMapping(value = {"/contIpForm"})
@RequiresPermissions(value={"avContIp:config"})
public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCfgId(Long.parseLong(ids));
@@ -173,19 +174,19 @@ public class AvContentController extends BaseController {
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+cfg.getFunctionId();
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId();
}
//修改CONTIP例配置状态
@RequestMapping(value = {"/updateAvContIpValid"})
@RequiresPermissions(value={"avContentIp:config"})
@RequiresPermissions(value={"avContIp:config"})
public String updateAvContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
avContentCfgService.updateContIpValid(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+functionId;
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId;
}
//修改CONTIP配置审核
@RequestMapping(value = {"/auditAvContIp"})
@RequiresPermissions(value={"avContentIp:audit"})
@RequiresPermissions(value={"avContIp:audit"})
public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId){
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
@@ -195,7 +196,7 @@ public class AvContentController extends BaseController {
}
}
return "redirect:" + adminPath +"/ntc/av/contentIpList?functionId="+functionId;
return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId;
}
/*****************************contIp业务***************/
@@ -263,4 +264,133 @@ public class AvContentController extends BaseController {
}
/*****************************picIp业务***************/
/*****************************contUrl业务***************/
//视频文本内容配置列表
@RequestMapping(value = {"/contUrlList"})
public String contUrlList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){
Page<BaseStringCfg> page = avContentCfgService.findContUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/contUrl/contUrlList";
}
//音视频CONTUrl新增界面
@RequestMapping(value = {"/contUrlForm"})
@RequiresPermissions(value={"avContUrl:config"})
public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCfgId(Long.parseLong(ids));
cfg = avContentCfgService.getContUrlCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
initFormCondition(model,cfg);
}
model.addAttribute("_cfg", cfg);
return "/cfg/av/contUrl/contUrlForm";
}
//保存CONTUrl信息
@RequestMapping(value = {"/saveContUrl"})
public String saveContUrl(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")BaseStringCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds){
try{
avContentCfgService.saveOrUpdateContUrl(cfg,areaCfgIds);
addMessage(model,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
}
//修改CONTUrl例配置状态
@RequestMapping(value = {"/updateAvContUrlValid"})
@RequiresPermissions(value={"avContUrl:config"})
public String updateAvContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
avContentCfgService.updateContUrlValid(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId;
}
//修改CONTUrl配置审核
@RequestMapping(value = {"/auditAvContUrl"})
@RequiresPermissions(value={"avContUrl:audit"})
public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
for(String id :idArray){
avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime);
}
}
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId;
}
/*****************************contUrl业务***************/
/*****************************picUrl业务***************/
//视频文本内容配置列表
@RequestMapping(value = {"/picUrlList"})
public String picUrlList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){
Page<BaseStringCfg> page = avContentCfgService.findPicUrlPage(new Page<BaseStringCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/picUrl/picUrlList";
}
//音视频CONTUrl新增界面
@RequestMapping(value = {"/picUrlForm"})
@RequiresPermissions(value={"avPicUrl:config"})
public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCfgId(Long.parseLong(ids));
cfg = avContentCfgService.getPicUrlCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
initFormCondition(model,cfg);
}
model.addAttribute("_cfg", cfg);
return "/cfg/av/picUrl/picUrlForm";
}
//保存CONTUrl信息
@RequestMapping(value = {"/savePicUrl"})
public String savePicUrl(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")BaseStringCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds){
try{
avContentCfgService.saveOrUpdatePicUrl(cfg,areaCfgIds);
addMessage(model,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(model,"save_failed");
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId();
}
//修改CONTUrl例配置状态
@RequestMapping(value = {"/updateAvPicUrlValid"})
@RequiresPermissions(value={"avPicUrl:config"})
public String updateAvPicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
avContentCfgService.updatePicUrlValid(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId;
}
//修改CONTUrl配置审核
@RequestMapping(value = {"/auditAvPicUrl"})
@RequiresPermissions(value={"avPicUrl:audit"})
public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId){
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
for(String id :idArray){
avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime);
}
}
return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId;
}
/*****************************picUrl业务***************/
}