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-03-14 13:58:42 +08:00
parent 08a7fb9f81 52ae5c0c43
commit 6e373f513b
12 changed files with 55 additions and 33 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()+"修改成功"); logger.info(taskInfo.getId()+"修改成功");
taskInfoService.saveOrUpdate(taskInfo); taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
}else{ }else{
if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
logger.info(taskInfo.getTaskName()+"重复数据"); logger.info(taskInfo.getTaskName()+"重复数据");
addMessage(model, "error"); addMessage(model, "save_failed");
return form(taskInfo, model); return form(taskInfo, model);
} }
// 保存用户信息 // 保存用户信息
taskInfoService.saveOrUpdate(taskInfo); taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
logger.info(taskInfo.getId()+"保存成功"); logger.info(taskInfo.getId()+"保存成功");
} }
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
e.printStackTrace(); e.printStackTrace();
addMessage(model, "error"); addMessage(model, "save_failed");
} }
return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; 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){ public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(","); String[] exId = ids.split(",");
taskInfoService.taskExamine(exId); taskInfoService.taskExamine(exId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; 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){ public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(","); String[] noId = ids.split(",");
taskInfoService.taskExamineNo(noId); taskInfoService.taskExamineNo(noId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; 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){ public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(","); String[] canclelId = ids.split(",");
taskInfoService.taskCancelExamine(canclelId); taskInfoService.taskCancelExamine(canclelId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; 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){ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(","); String[] delId = ids.split(",");
taskInfoService.delete(delId); taskInfoService.delete(delId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "delete_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; 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())){ }else if(!StringUtils.isBlank(cfg.getTableName())){
int serviceId=cfg.getServiceId(); int serviceId=cfg.getServiceId();
long compileId=getCompileId(cfg); long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId()); // cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date()); // cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO); cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId); cfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){ if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(cfg); long compileId=getCompileId(cfg);
cfg.setTableName(tableName); cfg.setTableName(tableName);
cfg.setCreatorId(cfg.getCurrentUser().getId()); // cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date()); // cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO); cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId); 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)){ if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(); long compileId=getCompileId();
ipCfg.setTableName(tableName); ipCfg.setTableName(tableName);
ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); // ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
ipCfg.setCreateTime(new Date()); // ipCfg.setCreateTime(new Date());
ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsValid(Constants.VALID_NO);
ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCfg.setCompileId(compileId); 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); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){ if(serviceConfigInfo!=null){
long compileId=getCompileId(cfg); long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId()); // cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date()); // cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO); cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId); 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()+"修改成功"); logger.info(requestInfo.getId()+"修改成功");
requestInfoService.saveOrUpdate(requestInfo); requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
}else{ }else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据"); logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage(model, "error"); addMessage(model, "save_failed");
return form(requestInfo, model); return form(requestInfo, model);
} }
// 保存用户信息 // 保存用户信息
requestInfoService.saveOrUpdate(requestInfo); requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
logger.info(requestInfo.getId()+"保存成功"); logger.info(requestInfo.getId()+"保存成功");
} }
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
e.printStackTrace(); e.printStackTrace();
addMessage(model, "error"); addMessage(model, "save_failed");
} }
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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){ public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(","); String[] exId = ids.split(",");
requestInfoService.requestExamine(exId); requestInfoService.requestExamine(exId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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){ public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(","); String[] noId = ids.split(",");
requestInfoService.requestExamineNo(noId); requestInfoService.requestExamineNo(noId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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){ public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(","); String[] canclelId = ids.split(",");
requestInfoService.requestCancelExamine(canclelId); requestInfoService.requestCancelExamine(canclelId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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){ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(","); String[] delId = ids.split(",");
requestInfoService.delete(delId); requestInfoService.delete(delId);
addMessage(redirectAttributes, "success"); addMessage(redirectAttributes, "delete_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; 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())){ }else if(!StringUtils.isBlank(stringCfg.getTableName())){
int serviceId=stringCfg.getServiceId(); int serviceId=stringCfg.getServiceId();
long compileId=getCompileId(stringCfg); long compileId=getCompileId(stringCfg);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); // stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date()); // stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId); stringCfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){ if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(stringCfg); long compileId=getCompileId(stringCfg);
stringCfg.setTableName(tableName); stringCfg.setTableName(tableName);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); // stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date()); // stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO); stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId); stringCfg.setCompileId(compileId);

2
src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
View File

@@ -22,7 +22,7 @@
<result column="classify" property="classify" jdbcType="VARCHAR" /> <result column="classify" property="classify" jdbcType="VARCHAR" />
<result column="attribute" property="attribute" jdbcType="VARCHAR" /> <result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" /> <result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="expr_type " property="exprType" jdbcType="INTEGER" /> <result column="expr_type" property="exprType" jdbcType="INTEGER" />
<result column="match_method" property="matchMethod" jdbcType="INTEGER" /> <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" /> <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />

4
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -22,7 +22,7 @@
<result column="attribute" property="attribute" jdbcType="VARCHAR" /> <result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" /> <result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="expr_type " property="exprType" jdbcType="INTEGER" /> <result column="expr_type" property="exprType" jdbcType="INTEGER" />
<result column="match_method" property="matchMethod" jdbcType="INTEGER" /> <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" /> <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
</resultMap> </resultMap>
@@ -47,7 +47,7 @@
<result column="attribute" property="attribute" jdbcType="VARCHAR" /> <result column="attribute" property="attribute" jdbcType="VARCHAR" />
<result column="lable" property="lable" jdbcType="VARCHAR" /> <result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="expr_type " property="exprType" jdbcType="INTEGER" /> <result column="expr_type" property="exprType" jdbcType="INTEGER" />
<result column="match_method" property="matchMethod" jdbcType="INTEGER" /> <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" /> <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
<result column="creator_name" property="creatorName" jdbcType="VARCHAR" /> <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />

3
src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java
View File

@@ -1,5 +1,7 @@
package com.nis.web.dao.systemService; package com.nis.web.dao.systemService;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.nis.domain.ServiceConfigInfo; import com.nis.domain.ServiceConfigInfo;
@@ -8,4 +10,5 @@ import com.nis.web.dao.MyBatisDao;
@MyBatisDao @MyBatisDao
public interface ServiceConfigInfoDao extends CrudDao<ServiceConfigInfo>{ public interface ServiceConfigInfoDao extends CrudDao<ServiceConfigInfo>{
public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId); public ServiceConfigInfo findSysServiceConfigInfo(@Param("service_id")int serviceId);
public List<ServiceConfigInfo> findList(@Param("service_id")int serviceId);
} }

14
src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.xml
View File

@@ -26,6 +26,20 @@
where where
service_id=#{service_id} and is_valid=1 service_id=#{service_id} and is_valid=1
</select> </select>
<select id="findList" resultMap="serviceConfigInfo">
select
id,
table_name,
table_desc,
table_type,
maat_table,
service_id,
is_valid
from
service_config_info
where
service_id=#{service_id} and is_valid=1
</select>
<insert id="insert"> <insert id="insert">
insert into service_config_info ( insert into service_config_info (

5
src/main/java/com/nis/web/service/systemService/ServiceConfigInfoService.java
View File

@@ -1,5 +1,7 @@
package com.nis.web.service.systemService; package com.nis.web.service.systemService;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -13,4 +15,7 @@ public class ServiceConfigInfoService {
public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){ public ServiceConfigInfo findSysServiceConfigInfo(int serviceId){
return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId); return serviceConfigInfoDao.findSysServiceConfigInfo(serviceId);
} }
public List<ServiceConfigInfo> findList(int serviceId){
return serviceConfigInfoDao.findList(serviceId);
}
} }

4
src/main/webapp/WEB-INF/tags/sys/message.tag
View File

@@ -5,6 +5,6 @@
<script type="text/javascript">top.$.jBox.closeTip();</script> <script type="text/javascript">top.$.jBox.closeTip();</script>
<c:if test="${not empty content}"> <c:if test="${not empty content}">
<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if> <c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if>
<div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button>${content}</div> <div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div>
<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("${content}","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script> <script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
</c:if> </c:if>