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

1、配置操作tag增加修改操作；2、音视频文件样例配置列表、表单界面、新增、修改功能涉及到functionService与functionRegion字典使用部分提交。

Browse Source
This commit is contained in:
zhangwei
2018-05-18 16:46:46 +08:00
parent ecb332df64
commit bee5dd6c05
22 changed files with 1684 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
@@ -28,9 +30,10 @@ import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.domain.configuration.RequestInfo;
import com.nis.main.ConvertTool;
//import com.nis.main.ConvertTool;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.JsonMapper;
import com.nis.web.service.ArchiveServcie;
import com.nis.web.service.AreaService;
@@ -44,6 +47,7 @@ import com.nis.web.service.UserService;
import com.nis.web.service.basics.ServiceDictInfoService;
import com.nis.web.service.basics.SysDictInfoService;
import com.nis.web.service.configuration.AppCfgService;
import com.nis.web.service.configuration.AvCfgService;
import com.nis.web.service.configuration.ComplexStringCfgService;
import com.nis.web.service.configuration.DnsIpCfgService;
import com.nis.web.service.configuration.FtpCfgService;
@@ -140,6 +144,8 @@ public class BaseController {
protected SpecificServiceCfgService specificServiceCfgService;
@Autowired
protected SpecificServiceHostCfgService specificServiceHostCfgService;
@Autowired
protected AvCfgService avCfgService;
/**
* 管理基础路径
*/
@@ -272,6 +278,32 @@ public class BaseController {
areaIpCfg.initDefaultValue();
model.addAttribute("_areaCfg", areaIpCfg);
}
protected void initFormCondition(Model model,BaseCfg cfg){
List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findFlDict();
model.addAttribute("fls", fls);
List<ServiceDictInfo> xzs=serviceDictInfoService.findXzDict();
model.addAttribute("xzs", xzs);
List<ServiceDictInfo> lables=serviceDictInfoService.findLableDict();
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);
//初始化一个默认的地域ip给界面
AreaIpCfg areaIpCfg=new AreaIpCfg();
areaIpCfg.initDefaultValue();
model.addAttribute("_areaCfg", areaIpCfg);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
model.addAttribute("regionList", regionList);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
model.addAttribute("serviceList", serviceList);
}
protected void initUpdateFormCondition(Model model,BaseCfg cfg){
//查询配置对应的地域ip
List<AreaIpCfg> areaCfgs=ipCfgService.getAreaCfgByCompileId(cfg.getCompileId());
@@ -319,6 +351,10 @@ public class BaseController {
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());
model.addAttribute("serviceList", serviceList);
}
protected void setSaveOrUpdateProps(Model model,BaseCfg cfg,String areaCfgIds) throws Exception{
String tableName=cfg.getTableName();
@@ -363,7 +399,7 @@ public class BaseController {
}
}
if(cfg.getCompileId()==null){
int compileId=new ConvertTool().getCompileId().intValue();
int compileId=0;
cfg.setCompileId(compileId);
}
Date date=new Date();

77
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -5,8 +5,16 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.Page;
import com.nis.domain.configuration.AppIdCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfg;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
* 处理音视频业务
* @author zhangwei
@@ -14,36 +22,55 @@ import org.springframework.web.bind.annotation.RequestMapping;
*/
@Controller
@RequestMapping("${adminPath}/ntc/av")
public class AvController {
public class AvController extends BaseController {
//音频样例配置列表
@RequestMapping(value = {"/sample/audioList"})
public String audioList(Model model,HttpServletRequest request,HttpServletResponse response){
return "/cfg/av/sample/audioList";
//音视频文件样例配置列表
@RequestMapping(value = {"/sample/fileSampleList"})
public String fileSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvFileSampleCfg entity){
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(new Page<AvFileSampleCfg>(request, response), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/fileSampleList";
}
//视频样例配置列表
@RequestMapping(value = {"/sample/vedioList"})
public String vedioList(Model model,HttpServletRequest request,HttpServletResponse response){
return "/cfg/av/sample/vedioList";
//音视频标志样例配置列表
@RequestMapping(value = {"/sample/signSampleList"})
public String signSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvSignSampleCfg entity){
Page<AvSignSampleCfg> page = avCfgService.getAvSignSampleList(new Page<AvSignSampleCfg>(request, response), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/signSampleList";
}
//图片样例配置列表
@RequestMapping(value = {"/sample/pictureList"})
public String pictureList(Model model,HttpServletRequest request,HttpServletResponse response){
//文件样例配置界面
@RequestMapping(value = {"/sample/fileSampleForm"})
public String fileSampleForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvFileSampleCfg entity){
if(!StringUtil.isEmpty(ids)){
entity = avCfgService.getAvFileSampleById(Long.parseLong(ids));
}
return "/cfg/av/sample/pictureList";
initFormCondition(model,entity);
model.addAttribute("_cfg", entity);
return "/cfg/av/fileSampleForm";
}
//voip样例配置列表
@RequestMapping(value = {"/sample/voipList"})
public String voipList(Model model,HttpServletRequest request,HttpServletResponse response){
return "/cfg/av/sample/voipList";
//标志样例配置界面
@RequestMapping(value = {"/sample/signSampleForm"})
public String signSampleForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvSignSampleCfg entity){
if(!StringUtil.isEmpty(ids)){
entity = avCfgService.getAvSignSampleById(Long.parseLong(ids));
}
initFormCondition(model,entity);
model.addAttribute("_cfg", entity);
return "/cfg/av/signSampleForm";
}
//色情场景样例配置列表
@RequestMapping(value = {"/sample/pornList"})
public String pornList(Model model,HttpServletRequest request,HttpServletResponse response){
return "/cfg/av/sample/pornList";
//保存文件样例配置
@RequestMapping(value = {"/sample/saveFileSample"})
public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvFileSampleCfg entity){
avCfgService.saveOrUpdateAvFileSample(entity);
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
}
//保存标志样例配置
@RequestMapping(value = {"/sample/saveSignSample"})
public String saveSignSample(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvSignSampleCfg entity){
avCfgService.saveOrUpdateAvSignSample(entity);
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+entity.getFunctionId();
}
}