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:
zhangshilin
2018-03-17 17:09:33 +08:00
parent d5a2a32c51 93d7f3a917
commit 28d9421cbf
22 changed files with 168 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -186,8 +186,8 @@ public class ComplexStringCfgController extends BaseController{
}else if(!StringUtils.isBlank(cfg.getTableName())){
int serviceId=cfg.getServiceId();
long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(cfg);
cfg.setTableName(tableName);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);

4
src/main/java/com/nis/web/controller/configuration/IpCfgController.java
View File

@@ -262,8 +262,8 @@ public class IpCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId();
ipCfg.setTableName(tableName);
ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
ipCfg.setCreateTime(new Date());
// ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
// ipCfg.setCreateTime(new Date());
ipCfg.setIsValid(Constants.VALID_NO);
ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCfg.setCompileId(compileId);

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

@@ -144,8 +144,8 @@ public class NumCfgController extends BaseController{
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);

16
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -62,22 +62,22 @@ public class RequestInfoController extends BaseController{
// 保存用户信息
logger.info(requestInfo.getId()+"修改成功");
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "save_success");
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage(model, "error");
addMessage(model, "save_failed");
return form(requestInfo, model);
}
// 保存用户信息
requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "save_success");
logger.info(requestInfo.getId()+"保存成功");
}
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(model, "error");
addMessage(model, "save_failed");
}
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -104,7 +104,7 @@ public class RequestInfoController extends BaseController{
public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
requestInfoService.requestExamine(exId);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -118,7 +118,7 @@ public class RequestInfoController extends BaseController{
public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
requestInfoService.requestExamineNo(noId);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -132,7 +132,7 @@ public class RequestInfoController extends BaseController{
public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
requestInfoService.requestCancelExamine(canclelId);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
@@ -146,7 +146,7 @@ public class RequestInfoController extends BaseController{
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");
requestInfoService.delete(delId);
addMessage(redirectAttributes, "success");
addMessage(redirectAttributes, "delete_success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}

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

@@ -186,8 +186,8 @@ public class StringCfgController extends BaseController{
}else if(!StringUtils.isBlank(stringCfg.getTableName())){
int serviceId=stringCfg.getServiceId();
long compileId=getCompileId(stringCfg);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date());
// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
// stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(stringCfg);
stringCfg.setTableName(tableName);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date());
// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
// stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId);