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

1.修改视频场景增加监测封堵按钮2.增加patch调用接口更改配置状态方法

Browse Source
This commit is contained in:
zhanghongqing
2018-09-07 21:10:35 +08:00
parent 7a40bd1984
commit a5176658d1
6 changed files with 259 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,10 +15,12 @@ import org.springframework.ui.Model;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfg;
@@ -83,6 +85,8 @@ public class AvController extends BaseController {
model.addAttribute("regionValue",region.getConfigRegionValue());
break;
}*/
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
model.addAttribute("serviceList", serviceList);
//return "/cfg/av/signSampleList";
return "/cfg/av/switchSignSample";
}
@@ -330,21 +334,43 @@ public class AvController extends BaseController {
* @return
*/
@RequestMapping(value = {"/sample/auditAvSignSample"})
public String auditAvSignSample(AvSignSampleCfgModel cfg,Integer functionId,RedirectAttributes redirectAttributes){
public String auditAvSignSample(Integer preset,AvSignSampleCfgModel cfg,Integer functionId,RedirectAttributes redirectAttributes){
//预置配置
try {
if(preset!=null&&1==preset){
avCfgService.auditAvSignSample();
addMessage(redirectAttributes,"audit_success");
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;
}
} catch (Exception e1) {
e1.printStackTrace();
if(e1 instanceof MaatConvertException) {
logger.error("预置失败",e1);
addMessage(redirectAttributes,"request_service_failed");
}else {
logger.error("auditAvSignSample failed",e1);
addMessage(redirectAttributes,"audit_failed");
}
}
//修改下发配置
if(cfg != null && cfg.getCfgs() != null ){
for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) {
if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){
avSignSampleCfg.setIsValid(0);
}
if(cfg.getAction()!=null){
avSignSampleCfg.setAction(cfg.getAction());
}
//isValid值变更才下发
if(!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try {
avCfgService.auditAvSignSample(avSignSampleCfg);
addMessage(redirectAttributes,"audit_success");
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.error("下发失败",e);
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"request_service_failed");
}else {
logger.error("auditAvSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
@@ -352,7 +378,7 @@ public class AvController extends BaseController {
}
}
}
// }
}
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;
}