diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
index 0837f8185..6b30fd483 100644
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -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";
}
diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
index 85d816c50..b0d980bfc 100644
--- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
@@ -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);
diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
index 4ff3d08be..7747fa609 100644
--- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -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);
diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
index 5aa2a68fb..f064d3d71 100644
--- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
@@ -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);
diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index 84883214d..c20c7c975 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -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";
}
diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
index 2430efdc8..c1da0c564 100644
--- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
@@ -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);
diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
index f32932669..d59d28801 100644
--- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
index f9fc17fe4..a818ea17d 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -22,7 +22,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java
index 6d84a74b5..8b86b0a79 100644
--- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java
+++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java
@@ -1,5 +1,7 @@
package com.nis.web.dao.systemService;
+import java.util.List;
+
import org.apache.ibatis.annotations.Param;
import com.nis.domain.ServiceConfigInfo;
@@ -8,4 +10,5 @@ import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface ServiceConfigInfoDao extends CrudDao{
public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId);
+ public List findList(@Param("service_id")int serviceId);
}
diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml
index eaebed82d..52b8d4137 100644
--- a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml
@@ -26,6 +26,20 @@
where
service_id=#{service_id} and is_valid=1
+
insert into service_config_info (
diff --git a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java
index 58611bf69..a40c7728c 100644
--- a/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java
+++ b/src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java
@@ -1,5 +1,7 @@
package com.nis.web.service.systemService;
+import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,4 +15,7 @@ public class ServiceConfigInfoService {
public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){
return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId);
}
+ public List findList(int serviceId){
+ return serviceConfigInfoDao.findList(serviceId);
+ }
}
diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag
index 29af115b5..3e6d03cb1 100644
--- a/src/main/webapp/WEB-INF/tags/sys/message.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/message.tag
@@ -5,6 +5,6 @@
- ${content}
-
+
+
\ No newline at end of file