From f909c1938e1c670dc7dd51275dba67e70057072c Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac>
Date: Tue, 16 Oct 2018 18:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0APP=20IP=E7=89=B9=E5=BE=81?=
 =?UTF-8?q?=E5=9F=9F=E9=85=8D=E7=BD=AE(1028)=E6=97=B6=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=8A=A0service=E5=92=8CuserRegion=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/restful/RestBusinessCode.java   |  9 +++++++++
 src/main/java/com/nis/util/GroupReuseVal.java    | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/nis/restful/RestBusinessCode.java b/src/main/java/com/nis/restful/RestBusinessCode.java
index fb41663..89c5dd6 100644
--- a/src/main/java/com/nis/restful/RestBusinessCode.java
+++ b/src/main/java/com/nis/restful/RestBusinessCode.java
@@ -409,6 +409,15 @@ public enum RestBusinessCode {
 	 * 域配置中的tableName不是分组复用的域表
 	 */
 	TableNameUnReuse(4002102, "域配置中tableName不是分组复用的域表"),
+	/**
+	 * 分组复用域配置下发到阀门时userRegion不能为空
+	 */
+	ReUseUserRegionIsNull(4002102, "域配置需要下发到阀门，userRegion不能为空"),
+	
+	/**
+	 * 添加分组复用域配置时,service只能为空或1028
+	 */
+	ReUseServiceRange(4002102, "添加分组复用域配置时,service只能为空或1028"),
 	
 	/**
 	 *数值域配置的lowBoundary值不在有效范围内
diff --git a/src/main/java/com/nis/util/GroupReuseVal.java b/src/main/java/com/nis/util/GroupReuseVal.java
index 28b99f7..ab9311d 100644
--- a/src/main/java/com/nis/util/GroupReuseVal.java
+++ b/src/main/java/com/nis/util/GroupReuseVal.java
@@ -97,6 +97,22 @@ public class GroupReuseVal {
 				for (IpRegion ipRegion : ipRegionList) {
 					// if (groupReuse.getIsValid() != 0 &&
 					// !regionGroupIdList.contains(ipRegion.getGroupId())) {
+					if (!StringUtil.isEmpty(groupReuse.getService())) {
+						if (groupReuse.getService().intValue()!=1028) {
+							throw new RestServiceException("ipRegionList中的regionId为"
+								+ ipRegion.getRegionId()
+								+ "的域配置的service只能为空或1028",
+								RestBusinessCode.ReUseServiceRange
+										.getValue());
+						}
+						if (StringUtil.isEmpty(ipRegion.getUserRegion())) {
+							throw new RestServiceException("ipRegionList中的regionId为"
+								+ ipRegion.getRegionId()
+								+ "的域配置需要下发到阀门，userRegion不能为空",
+								RestBusinessCode.ReUseUserRegionIsNull
+										.getValue());
+						}
+					}
 					
 					if (!StringUtil.isEmpty(ipRegion.getTableName())	
 							&& !groupReuseRegionMap.get("ipRegion").contains(ipRegion.getTableName())) {