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

查漏补缺 addMessage() messageType;

Browse Source
This commit is contained in:
zhangwq
2018-12-13 14:01:06 +08:00
parent 6dab8a5950
commit 46efc3320d
82 changed files with 174 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -81,14 +81,14 @@ public class AsnIpController extends BaseController{
public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
try{
asnIpCfgService.saveAsnIpCfg(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -100,11 +100,11 @@ public class AsnIpController extends BaseController{
try{
asnIpCfgService.update(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -116,13 +116,13 @@ public class AsnIpController extends BaseController{
,RedirectAttributes redirectAttributes){
try{
asnIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}
@@ -206,7 +206,7 @@ public class AsnIpController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("asnIp export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

14
src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
View File

@@ -70,11 +70,11 @@ public class IpReuseIpCfgController extends BaseController{
,RedirectAttributes redirectAttributes) {
try{
ipReuseIpCfgService.save(entity);;
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
}
@@ -86,11 +86,11 @@ public class IpReuseIpCfgController extends BaseController{
public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg cfg,RedirectAttributes redirectAttributes){
try{
ipReuseIpCfgService.update(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
}
@@ -101,13 +101,13 @@ public class IpReuseIpCfgController extends BaseController{
,RedirectAttributes redirectAttributes){
try{
ipReuseIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}

8
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -68,10 +68,10 @@ public class PolicyGroupController extends BaseController {
try {
policyGroupInfoService.saveOrUpdate(cfg);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
@@ -89,10 +89,10 @@ public class PolicyGroupController extends BaseController {
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try {
policyGroupInfoService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
}

8
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -213,10 +213,10 @@ public class ServiceDictInfoController extends BaseController {
try {
serviceDictInfoService.saveOrUpdate(serviceDictInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -236,10 +236,10 @@ public class ServiceDictInfoController extends BaseController {
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {
serviceDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
}

8
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -155,10 +155,10 @@ public class SysDictInfoController extends BaseController {
try {
sysDictInfoService.saveOrUpdate(sysDictInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -175,10 +175,10 @@ public class SysDictInfoController extends BaseController {
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {
sysDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
}

16
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -59,22 +59,22 @@ public class TaskInfoController extends BaseController{
// 保存用户信息
logger.info(taskInfo.getId()+"修改成功");
taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
}else{
if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
logger.info(taskInfo.getTaskName()+"重复数据");
addMessage(model, "save_failed");
addMessage(model,"error", "save_failed");
return form(taskInfo, model);
}
// 保存用户信息
taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
logger.info(taskInfo.getId()+"保存成功");
}
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -101,7 +101,7 @@ public class TaskInfoController extends BaseController{
public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
taskInfoService.taskExamine(exId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -115,7 +115,7 @@ public class TaskInfoController extends BaseController{
public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
taskInfoService.taskExamineNo(noId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -129,7 +129,7 @@ public class TaskInfoController extends BaseController{
public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
taskInfoService.taskCancelExamine(canclelId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -143,7 +143,7 @@ public class TaskInfoController extends BaseController{
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");
taskInfoService.delete(delId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}