From ac284ca8e38acd6f8a1fcd11a257b26496ca90c3 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 24 Oct 2018 16:09:32 +0800
Subject: [PATCH] =?UTF-8?q?(1)is=5Fhex=5Fbin=E5=AD=97=E6=AE=B5=E5=80=BC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=20(2)p2p=20=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=9F=9F=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/BaseController.java    | 47 ++++++++++++++-----
 .../configuration/FileTransferCfgService.java | 17 ++++++-
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 87459e452..1cd2c675d 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -957,9 +957,9 @@ public class BaseController {
 					}
 					if(isCaseInsenstive==null) {
 						if(hexP.equals("0")||hexP.equals("1")) {
-							baseStringCfg.setIsHex(0);
+							baseStringCfg.setIsCaseInsenstive(0);
 						}else if(hexP.equals("2")){
-							baseStringCfg.setIsHex(1);
+							baseStringCfg.setIsCaseInsenstive(1);
 						}else {
 							errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("is_case_insenstive"))+";");
 						}
@@ -983,14 +983,19 @@ public class BaseController {
 					if(hexP.equals("2")&&isCaseInsenstive.intValue()==0){
 						errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))+";");
 					}
-					if(isHex==0&&isCaseInsenstive==0) {
+				}
+				isHex=baseStringCfg.getIsHex();
+				isCaseInsenstive=baseStringCfg.getIsCaseInsenstive();
+				if(isHex!=null&&isCaseInsenstive!=null) {
+					if(isHex.intValue()==0&&isCaseInsenstive.intValue()==0) {
 						baseStringCfg.setIsHexbin(0);
-					}else if(isHex==1&&isCaseInsenstive==0) {
+					}else if(isHex.intValue()==1&&isCaseInsenstive.intValue()==0) {
 						baseStringCfg.setIsHexbin(1);
-					}else if(isHex==1&&isCaseInsenstive==1) {
+					}else if(isHex.intValue()==1&&isCaseInsenstive.intValue()==1) {
 						baseStringCfg.setIsHexbin(2);
 					}
 				}
+				
 			}
 			if (errInfo.toString().length() > 0) {//
 				errTip.append(String.format(prop.getProperty("line"), i + 2) + ",");
@@ -1155,9 +1160,9 @@ public class BaseController {
 					}
 					if(isCaseInsenstive==null) {
 						if(hexP.equals("0")||hexP.equals("1")) {
-							baseStringCfg.setIsHex(0);
+							baseStringCfg.setIsCaseInsenstive(0);
 						}else if(hexP.equals("2")){
-							baseStringCfg.setIsHex(1);
+							baseStringCfg.setIsCaseInsenstive(1);
 						}else {
 							errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("is_case_insenstive"))+";");
 						}
@@ -1181,15 +1186,18 @@ public class BaseController {
 					if(hexP.equals("2")&&isCaseInsenstive.intValue()==0){
 						errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))+";");
 					}
-					if(isHex==0&&isCaseInsenstive==0) {
+				}
+				isHex=baseStringCfg.getIsHex();
+				isCaseInsenstive=baseStringCfg.getIsCaseInsenstive();
+				if(isHex!=null&&isCaseInsenstive!=null) {
+					if(isHex.intValue()==0&&isCaseInsenstive.intValue()==0) {
 						baseStringCfg.setIsHexbin(0);
-					}else if(isHex==1&&isCaseInsenstive==0) {
+					}else if(isHex.intValue()==1&&isCaseInsenstive.intValue()==0) {
 						baseStringCfg.setIsHexbin(1);
-					}else if(isHex==1&&isCaseInsenstive==1) {
+					}else if(isHex.intValue()==1&&isCaseInsenstive.intValue()==1) {
 						baseStringCfg.setIsHexbin(2);
 					}
 				}
-				
 			}
 			if (errInfo.toString().length() > 0) {//
 				errTip.append(String.format(prop.getProperty("line"), i + 2) + ",");
@@ -3080,6 +3088,14 @@ public class BaseController {
 					if(regionDict.getDictId().intValue()==36) {
 						fileTransferCfgService.saveFtpCfg(stringCfgs);
 					}
+					if(regionDict.getFunctionId().equals(510)){ //P2p hash
+						/*if("p2p_hash".equals(regionDict.getConfigServiceType())) {
+							fileTransferCfgService.saveP2pHashCfg(stringCfgs);
+						}else {*/
+							fileTransferCfgService.saveP2pCfg(stringCfgs);
+						/*}*/
+						
+					}
 				}else if (regionDict.getRegionType().equals(3)) {
 					for(ComplexkeywordCfg cfg:complexkeywordCfgs) {
 						cfg.setAction(serviceDict.getAction());
@@ -3133,8 +3149,13 @@ public class BaseController {
 						mailCfgService.saveMailCfg(complexkeywordCfgs);
 					}
 				}
-				ipCfgService.saveCfgIndexOf(cfgIndexInfos);
-				appCfgService.savePolicyList(appPolicyCfgs);
+				if(cfgIndexInfos!=null&&cfgIndexInfos.size()>0) {
+					ipCfgService.saveCfgIndexOf(cfgIndexInfos);
+				}
+				if(appPolicyCfgs!=null&&appPolicyCfgs.size()>0) {
+					appCfgService.savePolicyList(appPolicyCfgs);
+				}
+				
 			}
 		} catch (Exception e) {
 			addMessage(redirectAttributes, e.getMessage());
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 80492195e..9f146d9b5 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -702,7 +702,22 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		dataMap.put("NTC_UNIVERSAL_IP", ipPortList);
 		return dataMap;
 	}
-	
+	/*public void saveP2pHashCfg(List<BaseStringCfg<?>> cfgs) {
+		for(BaseStringCfg cfg:cfgs){
+			if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+				cfg.setUserRegion1(cfg.getUserRegion2());
+				cfg.setUserRegion2(null);
+				fileTransferCfgDao.saveP2pHashCfg(cfg);
+			}
+		}
+	}*/
+	public void saveP2pCfg(List<BaseStringCfg<?>> cfgs) {
+		for(BaseStringCfg cfg:cfgs){
+			if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+				fileTransferCfgDao.saveP2pHashCfg(cfg);
+			}
+		}
+	}
 	/**
 	 * 保存p2p配置
 	 * @param entity