From 32b229e2335cc964695c988b61ef220e97468205 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Sun, 19 Aug 2018 18:00:08 +0800
Subject: [PATCH] =?UTF-8?q?1.P2P=E5=AE=A1=E6=A0=B8=E6=9C=AA=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=90=8E?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9C=AA=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=20=202.P2P=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2Hash=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9=E5=8D=81=E5=85=AD?=
 =?UTF-8?q?=E8=BF=9B=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/FileTransferCfgService.java | 15 ++++++--
 .../WEB-INF/views/cfg/complexCfgForm.jsp      | 36 ++++++++++---------
 .../views/cfg/fileTransfer/p2pForm.jsp        |  1 +
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 723943a81..aa3852253 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -558,7 +558,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	 * @param entity
 	 */
 	public void saveP2pCfg(CfgIndexInfo entity){
-		//设置区域运营商信息
+		// 设置区域运营商信息
 		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			Integer compileId = 0;
@@ -608,7 +608,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 						}
 					}
 				}
-				//保存区域IP信息
+				// 保存区域IP信息
 				if(entity.getAreaCfg()!=null){
 					for(AreaIpCfg cfg:entity.getAreaCfg()){
 						cfg.initDefaultValue();
@@ -623,8 +623,16 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			}
 			
 		}else{
+			// 审核未通过状态的配置 修改后状态改为未审核
+			CfgIndexInfo cfgIndexInfo = fileTransferCfgDao.getCfgIndexInfo(entity.getCfgId());
+			if(cfgIndexInfo.getIsAudit() == 2) {
+				entity.setIsValid(0);
+				entity.setIsAudit(0);
+			}
+			entity.setEditTime(new Date());
+			entity.setEditorId(entity.getCurrentUser().getId());
 			fileTransferCfgDao.updateCfgIndex(entity);
-			//无效子配置后，再新增子配置
+			// 删除无效子配置后，再新增子配置
 			fileTransferCfgDao.deleteP2pIpCfg(entity);
 			fileTransferCfgDao.deleteP2pHashCfg(entity);
 			fileTransferCfgDao.deleteP2pKeywordCfg(entity);
@@ -635,6 +643,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			areaIpCfgDao.deleteAreaIpCfg(area);
 			entity.setCreateTime(new Date());
 			entity.setCreatorId(entity.getCurrentUser().getId());
+			
 			if(entity.getIpPortList()!=null){
 				for(IpPortCfg cfg:entity.getIpPortList()){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 8d030295e..4c54b9877 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -46,6 +46,22 @@
 	</div>
 </c:if>
 <div class="row">
+	<c:if test="${isP2pHashCfg}">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
+			<div class="col-md-6">
+				<select name="userRegion2" class="selectpicker show-tick form-control">
+				<option value=""><spring:message code="select"/></option>
+				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
+						<option value="${hashType.itemCode}" <c:if test="${cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
+				</c:forEach>
+				</select>
+			</div>
+			<div for="userRegion2"></div>
+		</div>
+	</div>
+	</c:if>
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
@@ -70,22 +86,7 @@
 			<div for="${cfgName}.cfgKeywords"></div>
 		</div>
 	</div>
-	<c:if test="${region.configServiceType eq 'p2p_hash'}">
-	<div class="col-md-6">
-		<div class="form-group">
-			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
-			<div class="col-md-6">
-				<select name="userRegion2" class="selectpicker show-tick form-control">
-				<option value=""><spring:message code="select"/></option>
-				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
-						<option value="${hashType.itemCode}" <c:if test="${cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
-				</c:forEach>
-				</select>
-			</div>
-			<div for="userRegion2"></div>
-		</div>
-	</div>
-	</c:if>
+	
 </div>
 <div class="row">
 		<div class="col-md-6">
@@ -177,12 +178,15 @@
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
 		            <div class="col-md-6">
+		            	<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
 		            	<label class="radio-inline">
 		            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
+		            		<c:if test="${isP2pHashCfg}">checked disabled</c:if>
 		            		><spring:message code="hex"/>
 		            	</label>
 		            	<label class="radio-inline">
 		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
+		            		<c:if test="${isP2pHashCfg}">disabled</c:if>
 		            		><spring:message code="not_hex"/>
 		            	</label>
 		            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index 4949c0f99..515937be4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -188,6 +188,7 @@
 								<c:set var="keywordCfgIndex" value="0"></c:set>
 								<c:set var="subscribeIdCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:set var="isP2pHashCfg" value="${region.configServiceType eq 'p2p_hash'}"></c:set>
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>