多媒体日志增加可查看配置信息功能
This commit is contained in:
@@ -38,6 +38,8 @@ import com.nis.domain.Page;
|
||||
import com.nis.domain.configuration.AvFileSampleCfg;
|
||||
import com.nis.domain.configuration.AvSignSampleCfg;
|
||||
import com.nis.domain.configuration.AvSignSampleCfgModel;
|
||||
import com.nis.domain.configuration.BaseIpCfg;
|
||||
import com.nis.domain.configuration.BaseStringCfg;
|
||||
import com.nis.domain.configuration.FileDigestCfg;
|
||||
import com.nis.domain.configuration.IpPortCfg;
|
||||
import com.nis.domain.maat.ToMaatResult;
|
||||
@@ -116,17 +118,57 @@ public class AvController extends BaseController {
|
||||
//return "/cfg/av/signSampleList";
|
||||
return "/cfg/av/switchSignSample";
|
||||
}
|
||||
// 日志获取样例获取域配置信息
|
||||
@RequestMapping(value = {"ajaxSignSampleList"})
|
||||
public String ajaxSignSampleList(Model model,Long cfgId,Integer index,Integer compileId) {
|
||||
List<String[]> tabList = new ArrayList<String[]>();
|
||||
AvSignSampleCfg cfg = new AvSignSampleCfg();
|
||||
cfg.setCfgId(cfgId);
|
||||
cfg.setCompileId(compileId);
|
||||
List<AvSignSampleCfg> list = avCfgService.getSignSampleList(cfg);
|
||||
if(list!=null){
|
||||
cfg=list.get(0);
|
||||
}
|
||||
cfg.setCfgType("5");
|
||||
String cfgType = null;
|
||||
if(cfg.getCfgType()!=null){
|
||||
tabList.add(new String[]{"5",cfg.getCfgType()});
|
||||
cfgType = cfg.getCfgType();
|
||||
}
|
||||
model.addAttribute("_cfg", cfg);
|
||||
model.addAttribute("index", index);
|
||||
model.addAttribute("tabList", tabList);
|
||||
return "/cfg/av/switchSignSampleSubList";
|
||||
}
|
||||
|
||||
//文件样例配置界面
|
||||
@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));
|
||||
entity = avCfgService.getAvFileSampleById(Long.parseLong(ids),entity.getCompileId());
|
||||
}
|
||||
|
||||
initFormCondition(model,entity);
|
||||
model.addAttribute("_cfg", entity);
|
||||
return "/cfg/av/fileSampleForm";
|
||||
}
|
||||
// 日志获取样例获取域配置信息
|
||||
@RequestMapping(value = {"ajaxfileSampleList"})
|
||||
public String ajaxAvContIpList(Model model,Long cfgId,Integer index,Integer compileId) {
|
||||
AvFileSampleCfg cfg = avCfgService.getAvFileSampleById(cfgId,compileId);
|
||||
List<String[]> tabList = new ArrayList<String[]>();
|
||||
if(cfg!=null){
|
||||
String cfgType = null;
|
||||
if(!cfg.getCfgType().equals(cfgType)){
|
||||
tabList.add(new String[]{"5",cfg.getCfgType()});
|
||||
cfgType = cfg.getCfgType();
|
||||
}
|
||||
}
|
||||
model.addAttribute("_cfg", cfg);
|
||||
model.addAttribute("index", index);
|
||||
model.addAttribute("tabList", tabList);
|
||||
return "/cfg/av/fileSampleSubList";
|
||||
}
|
||||
//标志样例配置界面
|
||||
@RequestMapping(value = {"/sample/audioSignSampleForm"})
|
||||
public String audioSignSampleForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvSignSampleCfg entity){
|
||||
@@ -293,7 +335,7 @@ public class AvController extends BaseController {
|
||||
AvFileSampleCfg entity = new AvFileSampleCfg();
|
||||
String[] idArray = ids.split(",");
|
||||
for(String id :idArray){
|
||||
entity = avCfgService.getAvFileSampleById(Long.parseLong(id));
|
||||
entity = avCfgService.getAvFileSampleById(Long.parseLong(id),null);
|
||||
entity.setIsAudit(isAudit);
|
||||
entity.setIsValid(isValid);
|
||||
entity.setAuditorId(UserUtils.getUser().getId());
|
||||
|
||||
Reference in New Issue
Block a user