将策略分组、欺骗ip、dns策略、bgp、音视频文本、文件摘要、http内容替换业务Controller方法返回对象修改为redirectAttribute
This commit is contained in:
@@ -37,7 +37,9 @@ public class PolicyGroupController extends BaseController {
|
|||||||
|
|
||||||
//@RequiresPermissions(value={"basics:policyGroup:view"},logical=Logical.OR)
|
//@RequiresPermissions(value={"basics:policyGroup:view"},logical=Logical.OR)
|
||||||
@RequestMapping(value = {"/policyGroupList", ""})
|
@RequestMapping(value = {"/policyGroupList", ""})
|
||||||
public String policyGroupList(PolicyGroupInfo cfg,HttpServletRequest request, HttpServletResponse response, Model model) {
|
public String policyGroupList(PolicyGroupInfo cfg,HttpServletRequest request
|
||||||
|
, HttpServletResponse response, Model model
|
||||||
|
,RedirectAttributes redirectAttributes) {
|
||||||
if(cfg == null)cfg=new PolicyGroupInfo();
|
if(cfg == null)cfg=new PolicyGroupInfo();
|
||||||
Page<PolicyGroupInfo> pageCondition = new Page<PolicyGroupInfo>(request, response,"r");
|
Page<PolicyGroupInfo> pageCondition = new Page<PolicyGroupInfo>(request, response,"r");
|
||||||
|
|
||||||
@@ -57,7 +59,7 @@ public class PolicyGroupController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
|
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
|
||||||
@RequestMapping(value={"/policyGroupForm"})
|
@RequestMapping(value={"/policyGroupForm"})
|
||||||
public String form(String ids,Model model,String doAction) {
|
public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
|
||||||
PolicyGroupInfo policyGroup=new PolicyGroupInfo();
|
PolicyGroupInfo policyGroup=new PolicyGroupInfo();
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids));
|
policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids));
|
||||||
@@ -71,22 +73,15 @@ public class PolicyGroupController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
|
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
|
||||||
@RequestMapping(value = "saveOrUpdate")
|
@RequestMapping(value = "saveOrUpdate")
|
||||||
public String saveOrUpdate(PolicyGroupInfo cfg,Model model, RedirectAttributes redirectAttributes,String itType) {
|
public String saveOrUpdate(PolicyGroupInfo cfg,Model model,
|
||||||
|
RedirectAttributes redirectAttributes,String itType) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
policyGroupInfoService.saveOrUpdate(cfg);
|
policyGroupInfoService.saveOrUpdate(cfg);
|
||||||
if(!StringUtil.isEmpty(cfg.getGroupId())){
|
addMessage(redirectAttributes, "save_success");
|
||||||
addMessage(redirectAttributes, "save_success");
|
|
||||||
}else{
|
|
||||||
addMessage(redirectAttributes, "update_success");
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
logger.error("新增失败",e);
|
||||||
if(!StringUtil.isEmpty(cfg.getGroupId())){
|
addMessage(redirectAttributes, "save_failed");
|
||||||
addMessage(redirectAttributes, "save_failed");
|
|
||||||
}else{
|
|
||||||
addMessage(redirectAttributes, "update_failed");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
|
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
|
||||||
@@ -106,7 +101,7 @@ public class PolicyGroupController extends BaseController {
|
|||||||
policyGroupInfoService.deldete(ids,isValid);
|
policyGroupInfoService.deldete(ids,isValid);
|
||||||
addMessage(redirectAttributes, "delete_success");
|
addMessage(redirectAttributes, "delete_success");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
logger.error("删除失败",e);
|
||||||
addMessage(redirectAttributes, "delete_failed");
|
addMessage(redirectAttributes, "delete_failed");
|
||||||
}
|
}
|
||||||
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
|
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ import com.nis.web.service.configuration.DnsIpCfgService;
|
|||||||
public class DnsIpCfgController extends BaseController {
|
public class DnsIpCfgController extends BaseController {
|
||||||
|
|
||||||
@RequestMapping(value = {"/list"})
|
@RequestMapping(value = {"/list"})
|
||||||
public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity){
|
public String list(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response,"r"), entity);
|
Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response,"r"), entity);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
initPageCondition(model);
|
initPageCondition(model);
|
||||||
@@ -40,7 +42,9 @@ public class DnsIpCfgController extends BaseController {
|
|||||||
}
|
}
|
||||||
@RequestMapping(value = {"/form"})
|
@RequestMapping(value = {"/form"})
|
||||||
@RequiresPermissions(value={"dns:fake:ip:config"})
|
@RequiresPermissions(value={"dns:fake:ip:config"})
|
||||||
public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg){
|
public String form(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
cfg = dnsIpCfgService.getDnsIpCfg(Long.parseLong(ids));
|
cfg = dnsIpCfgService.getDnsIpCfg(Long.parseLong(ids));
|
||||||
initUpdateFormCondition(model, cfg);
|
initUpdateFormCondition(model, cfg);
|
||||||
@@ -56,15 +60,17 @@ public class DnsIpCfgController extends BaseController {
|
|||||||
|
|
||||||
@RequestMapping(value = {"/saveOrUpdate"})
|
@RequestMapping(value = {"/saveOrUpdate"})
|
||||||
@RequiresPermissions(value={"dns:fake:ip:config"})
|
@RequiresPermissions(value={"dns:fake:ip:config"})
|
||||||
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
|
public String saveOrUpdate(Model model,HttpServletRequest request
|
||||||
@ModelAttribute("cfg")DnsIpCfg cfg){
|
,HttpServletResponse response,
|
||||||
|
@ModelAttribute("cfg")DnsIpCfg cfg
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
try{
|
try{
|
||||||
dnsIpCfgService.saveOrUpdate(cfg);
|
dnsIpCfgService.saveOrUpdate(cfg);
|
||||||
addMessage(model,"save_success");
|
addMessage(redirectAttributes,"save_success");
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
logger.error("信息保存失败",e);
|
logger.error("信息保存失败",e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
addMessage(model,"save_failed");
|
addMessage(redirectAttributes,"save_failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId();
|
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId();
|
||||||
@@ -72,13 +78,16 @@ public class DnsIpCfgController extends BaseController {
|
|||||||
|
|
||||||
@RequestMapping(value = {"/delete"})
|
@RequestMapping(value = {"/delete"})
|
||||||
@RequiresPermissions(value={"dns:fake:ip:config"})
|
@RequiresPermissions(value={"dns:fake:ip:config"})
|
||||||
public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
public String delete(Integer isAudit,Integer isValid
|
||||||
|
,String ids,Integer functionId
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
dnsIpCfgService.delete(isAudit,isValid,ids,functionId);
|
dnsIpCfgService.delete(isAudit,isValid,ids,functionId);
|
||||||
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
|
||||||
}
|
}
|
||||||
@RequestMapping(value = {"/audit"})
|
@RequestMapping(value = {"/audit"})
|
||||||
//@RequiresPermissions(value={"dns:fake:ip:audit"})
|
//@RequiresPermissions(value={"dns:fake:ip:audit"})
|
||||||
public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
|
public String audit(Integer isAudit,Integer isValid,String ids
|
||||||
|
,Integer functionId, RedirectAttributes redirectAttributes) {
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
String[] idArray = ids.split(",");
|
String[] idArray = ids.split(",");
|
||||||
Date auditTime=new Date();
|
Date auditTime=new Date();
|
||||||
|
|||||||
@@ -38,33 +38,29 @@ public class DnsResStrategyController extends BaseController {
|
|||||||
String ids,
|
String ids,
|
||||||
@ModelAttribute("cfg")DnsResStrategy cfg
|
@ModelAttribute("cfg")DnsResStrategy cfg
|
||||||
,RedirectAttributes redirectAttributes){
|
,RedirectAttributes redirectAttributes){
|
||||||
try {
|
if(cfg == null){
|
||||||
if(cfg == null){
|
cfg=new DnsResStrategy();
|
||||||
cfg=new DnsResStrategy();
|
|
||||||
}
|
|
||||||
if(!StringUtil.isEmpty(ids)){
|
|
||||||
cfg = dnsResStrategyService.getDnsResStrategy(Long.valueOf(ids),-1);
|
|
||||||
initFormCondition(model, cfg);
|
|
||||||
model.addAttribute("isAdd", false);
|
|
||||||
}else{
|
|
||||||
//不存在响应策略为0的配置,则新策略时,cfgId默认为0
|
|
||||||
DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null);
|
|
||||||
if(dns0 == null){
|
|
||||||
cfg.setCfgId(0l);
|
|
||||||
cfg.setCfgDesc("无策略");
|
|
||||||
}
|
|
||||||
initFormCondition(model, cfg);
|
|
||||||
model.addAttribute("isAdd", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
//查询policyGroup列表,供响应策略选择
|
|
||||||
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
|
|
||||||
model.addAttribute("policyGroups", policyGroups);
|
|
||||||
|
|
||||||
model.addAttribute("_cfg", cfg);
|
|
||||||
} catch (Exception e) {
|
|
||||||
addMessage(redirectAttributes,e.getMessage());
|
|
||||||
}
|
}
|
||||||
|
if(!StringUtil.isEmpty(ids)){
|
||||||
|
cfg = dnsResStrategyService.getDnsResStrategy(Long.valueOf(ids),-1);
|
||||||
|
initFormCondition(model, cfg);
|
||||||
|
model.addAttribute("isAdd", false);
|
||||||
|
}else{
|
||||||
|
//不存在响应策略为0的配置,则新策略时,cfgId默认为0
|
||||||
|
DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null);
|
||||||
|
if(dns0 == null){
|
||||||
|
cfg.setCfgId(0l);
|
||||||
|
cfg.setCfgDesc("无策略");
|
||||||
|
}
|
||||||
|
initFormCondition(model, cfg);
|
||||||
|
model.addAttribute("isAdd", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询policyGroup列表,供响应策略选择
|
||||||
|
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
|
||||||
|
model.addAttribute("policyGroups", policyGroups);
|
||||||
|
|
||||||
|
model.addAttribute("_cfg", cfg);
|
||||||
return "/cfg/maintenance/dnsResStrategy/form";
|
return "/cfg/maintenance/dnsResStrategy/form";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,15 +86,10 @@ public class DnsResStrategyController extends BaseController {
|
|||||||
public String list(Model model,HttpServletRequest request,HttpServletResponse response
|
public String list(Model model,HttpServletRequest request,HttpServletResponse response
|
||||||
,@ModelAttribute("cfg")DnsResStrategy entity
|
,@ModelAttribute("cfg")DnsResStrategy entity
|
||||||
,RedirectAttributes redirectAttributes){
|
,RedirectAttributes redirectAttributes){
|
||||||
try{
|
//查询时left join policyGroup
|
||||||
//查询时left join policyGroup
|
Page<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(request, response,"r"), entity);
|
||||||
Page<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(request, response,"r"), entity);
|
model.addAttribute("page", page);
|
||||||
model.addAttribute("page", page);
|
initPageCondition(model);
|
||||||
initPageCondition(model);
|
|
||||||
addMessage(redirectAttributes,"select_success");
|
|
||||||
}catch(Exception e){
|
|
||||||
addMessage(redirectAttributes,"select_failed");
|
|
||||||
}
|
|
||||||
return "/cfg/maintenance/dnsResStrategy/list";
|
return "/cfg/maintenance/dnsResStrategy/list";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,13 +99,8 @@ public class DnsResStrategyController extends BaseController {
|
|||||||
,Model model,HttpServletRequest request
|
,Model model,HttpServletRequest request
|
||||||
,HttpServletResponse response
|
,HttpServletResponse response
|
||||||
,RedirectAttributes redirectAttributes){
|
,RedirectAttributes redirectAttributes){
|
||||||
try{
|
if(!StringUtil.isEmpty(ids)){
|
||||||
if(!StringUtil.isEmpty(ids)){
|
dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
|
||||||
dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
|
|
||||||
}
|
|
||||||
addMessage(redirectAttributes,"delete_success");
|
|
||||||
}catch(Exception e){
|
|
||||||
addMessage(redirectAttributes,"delete_failed");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
|
||||||
@@ -131,8 +117,6 @@ public class DnsResStrategyController extends BaseController {
|
|||||||
try {
|
try {
|
||||||
dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime);
|
dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime);
|
||||||
} catch (MaatConvertException e) {
|
} catch (MaatConvertException e) {
|
||||||
e.printStackTrace();
|
|
||||||
logger.info("VOIP配置下发失败:"+e.getMessage());
|
|
||||||
addMessage(redirectAttributes, e.getMessage());
|
addMessage(redirectAttributes, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -36,7 +36,9 @@ public class BgpCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"bgpList"})
|
@RequestMapping(value = {"bgpList"})
|
||||||
@RequiresPermissions(value={"other:bgp:config"})
|
@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> searchPage=new Page<CfgIndexInfo>(request,response,"a");
|
||||||
Page<CfgIndexInfo> page = bgpCfgService.getBgpList(searchPage, cfg);
|
Page<CfgIndexInfo> page = bgpCfgService.getBgpList(searchPage, cfg);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
@@ -49,7 +51,7 @@ public class BgpCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"bgpForm"})
|
@RequestMapping(value = {"bgpForm"})
|
||||||
@RequiresPermissions(value={"other:bgp:config"})
|
@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)){
|
if(StringUtils.isNotBlank(ids)){
|
||||||
entity = bgpCfgService.getBgpCfg(Long.parseLong(ids));
|
entity = bgpCfgService.getBgpCfg(Long.parseLong(ids));
|
||||||
initUpdateFormCondition(model,entity);
|
initUpdateFormCondition(model,entity);
|
||||||
@@ -62,7 +64,9 @@ public class BgpCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"saveBgpCfg"})
|
@RequestMapping(value = {"saveBgpCfg"})
|
||||||
@RequiresPermissions(value={"other:bgp:config"})
|
@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);
|
bgpCfgService.saveBgpCfg(entity);
|
||||||
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+entity.getFunctionId();
|
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+entity.getFunctionId();
|
||||||
}
|
}
|
||||||
@@ -98,14 +102,15 @@ public class BgpCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"updateBgpCfgValid"})
|
@RequestMapping(value = {"updateBgpCfgValid"})
|
||||||
@RequiresPermissions(value={"other:bgp:config"})
|
@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);
|
bgpCfgService.updateBgpCfgValid(isValid,ids,functionId);
|
||||||
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId;
|
return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = {"auditBgpCfg"})
|
@RequestMapping(value = {"auditBgpCfg"})
|
||||||
@RequiresPermissions(value={"other:bgp:audit"})
|
@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();
|
CfgIndexInfo entity = new CfgIndexInfo();
|
||||||
String[] idArray = ids.split(",");
|
String[] idArray = ids.split(",");
|
||||||
for(String id :idArray){
|
for(String id :idArray){
|
||||||
@@ -119,7 +124,7 @@ public class BgpCfgController extends BaseController{
|
|||||||
bgpCfgService.auditBgpCfg(entity,isAudit);
|
bgpCfgService.auditBgpCfg(entity,isAudit);
|
||||||
} catch (MaatConvertException e) {
|
} catch (MaatConvertException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
logger.info("bgp配置下发失败:"+e.getMessage());
|
logger.error("bgp配置下发失败",e);
|
||||||
addMessage(redirectAttributes, e.getMessage());
|
addMessage(redirectAttributes, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,7 +132,9 @@ public class FileTransferCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"fileDigestList"})
|
@RequestMapping(value = {"fileDigestList"})
|
||||||
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
|
@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> searchPage=new Page<FileDigestCfg>(request,response,"a");
|
||||||
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(searchPage, cfg);
|
Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(searchPage, cfg);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
@@ -142,7 +144,7 @@ public class FileTransferCfgController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"fileDigestForm"})
|
@RequestMapping(value = {"fileDigestForm"})
|
||||||
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
|
@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)){
|
if(StringUtils.isNotBlank(ids)){
|
||||||
entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
|
entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
|
||||||
initUpdateFormCondition(model,entity);
|
initUpdateFormCondition(model,entity);
|
||||||
@@ -154,8 +156,11 @@ public class FileTransferCfgController extends BaseController{
|
|||||||
}
|
}
|
||||||
@RequestMapping(value = {"saveFileDigestCfg"})
|
@RequestMapping(value = {"saveFileDigestCfg"})
|
||||||
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
|
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
|
||||||
public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
|
public String saveFileDigestCfg(Model model,HttpServletRequest request
|
||||||
FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) {
|
,HttpServletResponse response,String ids,
|
||||||
|
FileDigestCfg entity,MultipartFile file
|
||||||
|
,@ModelAttribute("areaCfgIds")String areaCfgIds
|
||||||
|
,RedirectAttributes redirectAttributes) {
|
||||||
try {
|
try {
|
||||||
Date fileTime=null;
|
Date fileTime=null;
|
||||||
Date date=new Date();
|
Date date=new Date();
|
||||||
@@ -196,14 +201,16 @@ public class FileTransferCfgController extends BaseController{
|
|||||||
}
|
}
|
||||||
@RequestMapping(value = {"updateFileDigestValid"})
|
@RequestMapping(value = {"updateFileDigestValid"})
|
||||||
@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
|
@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);
|
fileTransferCfgService.updateFileDigestCfgValid(isValid,ids,functionId);
|
||||||
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
|
return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = {"auditFileDigestCfg"})
|
@RequestMapping(value = {"auditFileDigestCfg"})
|
||||||
@RequiresPermissions(value={"fileTransfer:fileDigest:audit"})
|
@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)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
String[] idArray = ids.split(",");
|
String[] idArray = ids.split(",");
|
||||||
Date auditTime=new Date();
|
Date auditTime=new Date();
|
||||||
@@ -211,8 +218,7 @@ public class FileTransferCfgController extends BaseController{
|
|||||||
try {
|
try {
|
||||||
fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
|
fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime);
|
||||||
} catch (MaatConvertException e) {
|
} catch (MaatConvertException e) {
|
||||||
e.printStackTrace();
|
logger.error("File Digest配置下发失败",e);
|
||||||
logger.info("File Digest配置下发失败:"+e.getMessage());
|
|
||||||
addMessage(redirectAttributes, e.getMessage());
|
addMessage(redirectAttributes, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,10 @@ import com.nis.web.controller.BaseController;
|
|||||||
@RequestMapping("${adminPath}/proxy/control")
|
@RequestMapping("${adminPath}/proxy/control")
|
||||||
public class ControlPolicyController extends BaseController{
|
public class ControlPolicyController extends BaseController{
|
||||||
@RequestMapping(value = {"httpReqReplace/list"})
|
@RequestMapping(value = {"httpReqReplace/list"})
|
||||||
public String reqList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){
|
public String reqList(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response
|
||||||
|
,@ModelAttribute("cfg")HttpBodyCfg entity
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
|
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
initPageCondition(model);
|
initPageCondition(model);
|
||||||
@@ -44,7 +47,10 @@ public class ControlPolicyController extends BaseController{
|
|||||||
}
|
}
|
||||||
@RequestMapping(value = {"httpReqReplace/form"})
|
@RequestMapping(value = {"httpReqReplace/form"})
|
||||||
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
|
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
|
||||||
public String reqForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){
|
public String reqForm(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,String ids
|
||||||
|
,@ModelAttribute("cfg")HttpBodyCfg cfg
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
|
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
|
||||||
initUpdateFormCondition(model, cfg);
|
initUpdateFormCondition(model, cfg);
|
||||||
@@ -56,16 +62,17 @@ public class ControlPolicyController extends BaseController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = {"httpReqReplace/saveOrUpdate"})
|
@RequestMapping(value = {"httpReqReplace/saveOrUpdate"})
|
||||||
public String reqSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
|
public String reqSaveOrUpdate(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,
|
||||||
@ModelAttribute("cfg")HttpBodyCfg cfg,
|
@ModelAttribute("cfg")HttpBodyCfg cfg,
|
||||||
@ModelAttribute("areaCfgIds")String areaCfgIds){
|
@ModelAttribute("areaCfgIds")String areaCfgIds
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
try{
|
try{
|
||||||
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
|
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
|
||||||
addMessage(model,"save_success");
|
addMessage(redirectAttributes,"save_success");
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
logger.error("信息保存失败",e);
|
logger.error("信息保存失败",e);
|
||||||
e.printStackTrace();
|
addMessage(redirectAttributes,"save_failed");
|
||||||
addMessage(model,"save_failed");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
|
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
|
||||||
@@ -73,12 +80,15 @@ public class ControlPolicyController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"httpReqReplace/delete"})
|
@RequestMapping(value = {"httpReqReplace/delete"})
|
||||||
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
|
@RequiresPermissions(value={"proxy:contol:httpReqReplace:config"})
|
||||||
public String reqDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
public String reqDelete(Integer isAudit,Integer isValid,String ids
|
||||||
|
,Integer functionId
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
controlPolicyService.update(isAudit,isValid,ids,functionId);
|
controlPolicyService.update(isAudit,isValid,ids,functionId);
|
||||||
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
|
||||||
}
|
}
|
||||||
@RequestMapping(value = {"httpReqReplace/audit"})
|
@RequestMapping(value = {"httpReqReplace/audit"})
|
||||||
public String reqAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
|
public String reqAudit(Integer isAudit,Integer isValid,String ids
|
||||||
|
,Integer functionId, RedirectAttributes redirectAttributes) {
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
String[] idArray = ids.split(",");
|
String[] idArray = ids.split(",");
|
||||||
Date auditTime=new Date();
|
Date auditTime=new Date();
|
||||||
@@ -86,8 +96,7 @@ public class ControlPolicyController extends BaseController{
|
|||||||
try {
|
try {
|
||||||
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
|
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
|
||||||
} catch (MaatConvertException e) {
|
} catch (MaatConvertException e) {
|
||||||
e.printStackTrace();
|
logger.error("配置下发失败",e);
|
||||||
logger.info("配置下发失败:"+e.getMessage());
|
|
||||||
addMessage(redirectAttributes, e.getMessage());
|
addMessage(redirectAttributes, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -96,7 +105,9 @@ public class ControlPolicyController extends BaseController{
|
|||||||
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId;
|
||||||
}
|
}
|
||||||
@RequestMapping(value = {"httpResReplace/list"})
|
@RequestMapping(value = {"httpResReplace/list"})
|
||||||
public String reslist(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){
|
public String reslist(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
|
Page<HttpBodyCfg> page = controlPolicyService.findPage(new Page<HttpBodyCfg>(request, response,"r"), entity);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
initPageCondition(model);
|
initPageCondition(model);
|
||||||
@@ -104,7 +115,10 @@ public class ControlPolicyController extends BaseController{
|
|||||||
}
|
}
|
||||||
@RequestMapping(value = {"httpResReplace/form"})
|
@RequestMapping(value = {"httpResReplace/form"})
|
||||||
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
|
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
|
||||||
public String resForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){
|
public String resForm(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,String ids
|
||||||
|
,@ModelAttribute("cfg")HttpBodyCfg cfg
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
|
cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids));
|
||||||
initUpdateFormCondition(model, cfg);
|
initUpdateFormCondition(model, cfg);
|
||||||
@@ -116,16 +130,17 @@ public class ControlPolicyController extends BaseController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = {"httpResReplace/saveOrUpdate"})
|
@RequestMapping(value = {"httpResReplace/saveOrUpdate"})
|
||||||
public String resSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
|
public String resSaveOrUpdate(Model model,HttpServletRequest request
|
||||||
|
,HttpServletResponse response,
|
||||||
@ModelAttribute("cfg")HttpBodyCfg cfg,
|
@ModelAttribute("cfg")HttpBodyCfg cfg,
|
||||||
@ModelAttribute("areaCfgIds")String areaCfgIds){
|
@ModelAttribute("areaCfgIds")String areaCfgIds
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
try{
|
try{
|
||||||
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
|
controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
|
||||||
addMessage(model,"save_success");
|
addMessage(redirectAttributes,"save_success");
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
logger.error("信息保存失败",e);
|
logger.error("信息保存失败",e);
|
||||||
e.printStackTrace();
|
addMessage(redirectAttributes,"save_failed");
|
||||||
addMessage(model,"save_failed");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+cfg.getFunctionId();
|
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+cfg.getFunctionId();
|
||||||
@@ -133,12 +148,15 @@ public class ControlPolicyController extends BaseController{
|
|||||||
|
|
||||||
@RequestMapping(value = {"httpResReplace/delete"})
|
@RequestMapping(value = {"httpResReplace/delete"})
|
||||||
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
|
@RequiresPermissions(value={"proxy:contol:httpResReplace:config"})
|
||||||
public String resDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
public String resDelete(Integer isAudit,Integer isValid
|
||||||
|
,String ids,Integer functionId
|
||||||
|
,RedirectAttributes redirectAttributes){
|
||||||
controlPolicyService.update(isAudit,isValid,ids,functionId);
|
controlPolicyService.update(isAudit,isValid,ids,functionId);
|
||||||
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+functionId;
|
||||||
}
|
}
|
||||||
@RequestMapping(value = {"httpResReplace/audit"})
|
@RequestMapping(value = {"httpResReplace/audit"})
|
||||||
public String resAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
|
public String resAudit(Integer isAudit,Integer isValid,String ids
|
||||||
|
,Integer functionId, RedirectAttributes redirectAttributes) {
|
||||||
if(!StringUtil.isEmpty(ids)){
|
if(!StringUtil.isEmpty(ids)){
|
||||||
String[] idArray = ids.split(",");
|
String[] idArray = ids.split(",");
|
||||||
Date auditTime=new Date();
|
Date auditTime=new Date();
|
||||||
@@ -147,7 +165,7 @@ public class ControlPolicyController extends BaseController{
|
|||||||
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
|
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
|
||||||
} catch (MaatConvertException e) {
|
} catch (MaatConvertException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
logger.info("配置下发失败:"+e.getMessage());
|
logger.error("配置下发失败",e);
|
||||||
addMessage(redirectAttributes, e.getMessage());
|
addMessage(redirectAttributes, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user