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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
chenjinsong
2018-04-08 17:07:39 +08:00
parent 1828b726ba b2ae24021a
commit 40ff67f6f2
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -190,11 +190,11 @@ public class ComplexStringCfgController extends BaseController{
cfg.setEditTime(new Date()); cfg.setEditTime(new Date());
complexStringCfgService.updateStringCfg(cfg); complexStringCfgService.updateStringCfg(cfg);
} }
addMessage(model,"保存成功,正在为您跳转页面..."); addMessage(model,"save_success");
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
logger.error("保存失败!",e); logger.error("保存失败!",e);
addMessage(model,"保存失败！"); addMessage(model,"save_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -246,15 +246,15 @@ public class ComplexStringCfgController extends BaseController{
} }
int result=complexStringCfgService.auditStringCfg(bean,cfg); int result=complexStringCfgService.auditStringCfg(bean,cfg);
if(result!=0){ if(result!=0){
addMessage(model,"审核成功!"); addMessage(model,"audit_success");
}else{ }else{
addMessage(model,"审核失败!"); addMessage(model,"audit_failed");
} }
} }
}catch(Exception e){ }catch(Exception e){
logger.error("发生异常",e); logger.error("发生异常",e);
addMessage(model,"审核失败！"); addMessage(model,"audit_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -291,14 +291,14 @@ public class ComplexStringCfgController extends BaseController{
cfg.setEditTime(new Date()); cfg.setEditTime(new Date());
cfg.setIsValid(Constants.VALID_DEL); cfg.setIsValid(Constants.VALID_DEL);
int result=complexStringCfgService.deleteStringCfg(cfg); int result=complexStringCfgService.deleteStringCfg(cfg);
addMessage(model,"删除成功,正在为您跳转页面..."); addMessage(model,"delete_success");
}else{ }else{
logger.error("通过审核的配置不能删除！"); logger.error("通过审核的配置不能删除！");
} }
}catch(Exception e){ }catch(Exception e){
logger.error("删除失败", e); logger.error("删除失败", e);
addMessage(model,"删除失败！"); addMessage(model,"delete_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }

14
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

@@ -691,9 +691,9 @@ public class MultipleCfgController extends BaseController{
multipleCfgService.deleteCfg(resultCfg); multipleCfgService.deleteCfg(resultCfg);
}catch (Exception e) { }catch (Exception e) {
logger.error("删除失败"); logger.error("删除失败");
addMessage(model,"删除,正在为您跳转页面..."); addMessage(model,"delete_failed");
} }
addMessage(model,"删除成功,正在为您跳转页面..."); addMessage(model,"delete_success");
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -812,12 +812,12 @@ public class MultipleCfgController extends BaseController{
}else if("update".equals(operator)){ }else if("update".equals(operator)){
multipleCfgService.updateCfg(cfg); multipleCfgService.updateCfg(cfg);
} }
addMessage(model,"保存成功,正在为您跳转页面..."); addMessage(model,"save_success");
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("保存失败！",e); logger.error("保存失败！",e);
// TODO: handle exception // TODO: handle exception
addMessage(model,"保存失败！"); addMessage(model,"save_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -1035,13 +1035,13 @@ public class MultipleCfgController extends BaseController{
} }
boolean result=multipleCfgService.auditCfg(resultCfg,searchCfg); boolean result=multipleCfgService.auditCfg(resultCfg,searchCfg);
if(!result){ if(!result){
addMessage(model,"审核失败"); addMessage(model,"audit_failed");
}else{ }else{
addMessage(model,"审核成功,正在为您跳转页面..."); addMessage(model,"audit_success");
} }
}catch (Exception e) { }catch (Exception e) {
logger.error("审核失败",e); logger.error("审核失败",e);
addMessage(model,"审核失败"); addMessage(model,"audit_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }

12
src/main/java/com/nis/web/controller/configuration/NumCfgController.java
View File

@@ -160,11 +160,11 @@ public class NumCfgController extends BaseController{
} }
model.addAttribute("serviceId",serviceId); model.addAttribute("serviceId",serviceId);
model.addAttribute("action",cfg.getAction()); model.addAttribute("action",cfg.getAction());
addMessage(model,"保存成功,正在为您跳转页面..."); addMessage(model,"save_success");
} }
}catch(Exception e){ }catch(Exception e){
logger.error("保存失败", e); logger.error("保存失败", e);
addMessage(model,"保存失败！"); addMessage(model,"save_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -209,9 +209,9 @@ public class NumCfgController extends BaseController{
} }
int result=numCfgService.auditNumCfg(bean,cfg); int result=numCfgService.auditNumCfg(bean,cfg);
if(result!=0){ if(result!=0){
addMessage(model, "审核成功"); addMessage(model, "audit_success");
}else{ }else{
addMessage(model, "审核失败"); addMessage(model, "audit_failed");
} }
} }
@@ -219,7 +219,7 @@ public class NumCfgController extends BaseController{
}catch (Exception e) { }catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("审核失败",e); logger.error("审核失败",e);
addMessage(model, "审核失败"); addMessage(model, "audit_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -251,7 +251,7 @@ public class NumCfgController extends BaseController{
cfg.setEditTime(new Date()); cfg.setEditTime(new Date());
cfg.setIsValid(Constants.VALID_DEL); cfg.setIsValid(Constants.VALID_DEL);
int result=numCfgService.deleteNumCfg(cfg); int result=numCfgService.deleteNumCfg(cfg);
addMessage(model,"删除成功,正在为您跳转页面..."); addMessage(model,"delete_success");
}else{ }else{
logger.error("通过审核的配置不能删除！"); logger.error("通过审核的配置不能删除！");
} }

14
src/main/java/com/nis/web/controller/configuration/StringCfgController.java
View File

@@ -195,11 +195,11 @@ public class StringCfgController extends BaseController{
stringCfg.setEditTime(new Date()); stringCfg.setEditTime(new Date());
stringCfgService.updateStringCfg(stringCfg); stringCfgService.updateStringCfg(stringCfg);
} }
addMessage(model,"保存成功,正在为您跳转页面..."); addMessage(model,"save_success");
}catch (Exception e) { }catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("保存失败！",e); logger.error("保存失败！",e);
addMessage(model,"保存失败!"); addMessage(model,"save_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -253,16 +253,16 @@ public class StringCfgController extends BaseController{
} }
int result=stringCfgService.auditStringCfg(bean,stringCfg); int result=stringCfgService.auditStringCfg(bean,stringCfg);
if(result!=0){ if(result!=0){
addMessage(model,"审核成功!"); addMessage(model,"audit_success");
}else{ }else{
addMessage(model,"审核失败！"); addMessage(model,"audit_failed");
} }
} }
}catch (Exception e) { }catch (Exception e) {
// TODO: handle exception // TODO: handle exception
logger.error("审核失败", e); logger.error("审核失败", e);
addMessage(model,"审核失败！"); addMessage(model,"audit_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }
@@ -299,14 +299,14 @@ public class StringCfgController extends BaseController{
stringCfg.setEditTime(new Date()); stringCfg.setEditTime(new Date());
stringCfg.setIsValid(Constants.VALID_DEL); stringCfg.setIsValid(Constants.VALID_DEL);
int result=stringCfgService.deleteStringCfg(stringCfg); int result=stringCfgService.deleteStringCfg(stringCfg);
addMessage(model,"删除成功,正在为您跳转页面..."); addMessage(model,"delete_success");
}else{ }else{
logger.error("通过审核的配置不能删除！"); logger.error("通过审核的配置不能删除！");
} }
}catch(Exception e){ }catch(Exception e){
logger.error("删除失败",e); logger.error("删除失败",e);
addMessage(model,"删除失败！"); addMessage(model,"delete_failed");
} }
return "/cfg/resultPage"; return "/cfg/resultPage";
} }