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

文件摘要配置下发问题修改.

Browse Source
This commit is contained in:
zhangwenqing
2018-08-30 17:28:55 +08:00
parent a28087e5ad
commit e6d02f62fb
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -531,7 +531,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
// 修改域配置审核状态
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId"});
BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId","cfgType"});
stringCfgDao.updateSubscribeIdCfg(cfg);
}
@@ -565,6 +565,12 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
// 审核通过：添加各子域配置
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
Map<String,List> subIdMap = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
groupRelationList=subIdMap.get("groupList");
strRegionList=subIdMap.get("dstList");
}
if(areaIpCfgList != null && areaIpCfgList.size() >0){
Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);

12
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -56,9 +56,9 @@
}); */
if(flag){
//将disable属性的元素删除
/* $(".disabled").each(function(){
$(".disabled").each(function(){
$(this).remove();
}); */
});
$("input[name$='exprType']").attr("disabled",false);
/* if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
$("input[name$='exprType']").val(1);
@@ -130,10 +130,10 @@
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<input type="hidden" name="cfgType"
value="${region.configRegionValue}">
<input type="hidden" name="cfgRegionCode"
value="${region.configRegionCode}">
<c:if test="${region.configServiceType ne 'subscribe_id'}">
<input type="hidden" name="cfgType" value="${region.configRegionValue}">
<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
</c:if>
</c:if>
</c:forEach>
<div class="form-body">

12
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
View File

@@ -11,6 +11,18 @@
</style>
</head>
<c:if test="${fn:length(tabList)==0}">
<div id="NTC_UNIVERSAL_IPInfo${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<spring:message code='no_data' />
</div>
</div>
</div>
</div>
</c:if>
<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
class="col-md-1 tabInfo" name="tabTitle${index }">