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

将策略分组、欺骗ip、dns策略、bgp、音视频文本、文件摘要、http内容替换业务Controller方法返回对象修改为redirectAttribute

Browse Source
This commit is contained in:
duandongmei
2018-07-02 14:07:47 +08:00
parent d36e618a4d
commit ab0ed9ce05
7 changed files with 220 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

17
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

@@ -36,7 +36,9 @@ public class BgpCfgController extends BaseController{
@RequestMapping(value = {"bgpList"})
@RequiresPermissions(value={"other:bgp:config"})
public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg
,HttpServletRequest request,HttpServletResponse response
,RedirectAttributes redirectAttributes) {
Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
Page<CfgIndexInfo> page = bgpCfgService.getBgpList(searchPage, cfg);
model.addAttribute("page", page);
@@ -49,7 +51,7 @@ public class BgpCfgController extends BaseController{
@RequestMapping(value = {"bgpForm"})
@RequiresPermissions(value={"other:bgp:config"})
public String bgpForm(Model model,String ids,CfgIndexInfo entity) {
public String bgpForm(Model model,String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
if(StringUtils.isNotBlank(ids)){
entity = bgpCfgService.getBgpCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
@@ -62,7 +64,9 @@ public class BgpCfgController extends BaseController{
@RequestMapping(value = {"saveBgpCfg"})
@RequiresPermissions(value={"other:bgp:config"})
public String saveBgpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
public String saveBgpCfg(Model model,HttpServletRequest request,HttpServletResponse response
,String ids,CfgIndexInfo entity
,RedirectAttributes redirectAttributes) {
bgpCfgService.saveBgpCfg(entity);
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+entity.getFunctionId();
}
@@ -98,14 +102,15 @@ public class BgpCfgController extends BaseController{
@RequestMapping(value = {"updateBgpCfgValid"})
@RequiresPermissions(value={"other:bgp:config"})
public String updateBgpCfgValid(Integer isValid,String ids,Integer functionId) {
public String updateBgpCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
bgpCfgService.updateBgpCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId;
}
@RequestMapping(value = {"auditBgpCfg"})
@RequiresPermissions(value={"other:bgp:audit"})
public String auditBgpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
public String auditBgpCfg(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
@@ -119,7 +124,7 @@ public class BgpCfgController extends BaseController{
bgpCfgService.auditBgpCfg(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("bgp配置下发失败："+e.getMessage());
logger.error("bgp配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
}
}

22
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -132,7 +132,9 @@ public class FileTransferCfgController extends BaseController{
@RequestMapping(value = {"fileDigestList"})
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg,HttpServletRequest request,HttpServletResponse response) {
public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg
,HttpServletRequest request,HttpServletResponse response
,RedirectAttributes redirectAttributes) {
Page<FileDigestCfg> searchPage=new Page<FileDigestCfg>(request,response,"a");
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(searchPage, cfg);
model.addAttribute("page", page);
@@ -142,7 +144,7 @@ public class FileTransferCfgController extends BaseController{
@RequestMapping(value = {"fileDigestForm"})
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String fileDigestForm(Model model,String ids,FileDigestCfg entity) {
public String fileDigestForm(Model model,String ids,FileDigestCfg entity,RedirectAttributes redirectAttributes) {
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
@@ -154,8 +156,11 @@ public class FileTransferCfgController extends BaseController{
}
@RequestMapping(value = {"saveFileDigestCfg"})
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) {
public String saveFileDigestCfg(Model model,HttpServletRequest request
,HttpServletResponse response,String ids,
FileDigestCfg entity,MultipartFile file
,@ModelAttribute("areaCfgIds")String areaCfgIds
,RedirectAttributes redirectAttributes) {
try {
Date fileTime=null;
Date date=new Date();
@@ -196,14 +201,16 @@ public class FileTransferCfgController extends BaseController{
}
@RequestMapping(value = {"updateFileDigestValid"})
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String updateFileDigestValid(Integer isValid,String ids,Integer functionId) {
public String updateFileDigestValid(Integer isValid,String ids,Integer functionId
,RedirectAttributes redirectAttributes) {
fileTransferCfgService.updateFileDigestCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
}
@RequestMapping(value = {"auditFileDigestCfg"})
@RequiresPermissions(value={"fileTransfer:fileDigest:audit"})
public String auditFileDigestCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
public String auditFileDigestCfg(Integer isAudit,Integer isValid
,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -211,8 +218,7 @@ public class FileTransferCfgController extends BaseController{
try {
fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("File Digest配置下发失败："+e.getMessage());
logger.error("File Digest配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
}
}