From ec574ad5d48a345567b681742b8dca5b00dbda1f Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Mon, 26 Nov 2018 18:20:22 +0800
Subject: [PATCH] =?UTF-8?q?inlineip=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/callback/InlineIp.java     | 28 +++++++++++++++++--
 .../java/com/nis/web/service/BaseService.java |  1 +
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/domain/callback/InlineIp.java b/src/main/java/com/nis/domain/callback/InlineIp.java
index ebd45ef2b..c5fc687bf 100644
--- a/src/main/java/com/nis/domain/callback/InlineIp.java
+++ b/src/main/java/com/nis/domain/callback/InlineIp.java
@@ -11,6 +11,10 @@ package com.nis.domain.callback;
 import java.util.Date;
 
 import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.StringUtils;
+import com.nis.web.service.SpringContextHolder;
+import com.nis.web.service.basics.SysDictInfoService;
 
 /**
  * @ClassName: InlineIp.java 
@@ -58,7 +62,9 @@ public class InlineIp {
 	private Integer policyGroup;
 	@Expose
 	private String userRegion;//用于存储协议跟流量阀值
-	
+	@Expose
+	@SerializedName("effectiveRange")
+	private String areaEffectiveIds ;
 	
 	public String getUserRegion() {
 		return userRegion;
@@ -302,5 +308,23 @@ public class InlineIp {
 	public void setPolicyGroup(Integer policyGroup) {
 		this.policyGroup = policyGroup;
 	}
-	
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	/**
+	 * areaEffectiveIds 
+	 * areaEffectiveIds=7242:5,7212:4,7122:3
+	 * 接口要求格式为：72425,72124,71223
+	 * @param areaEffectiveIds
+	 */
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		if(StringUtils.isEmpty(areaEffectiveIds)){
+			areaEffectiveIds="0";
+		}else {
+			// 组织区域、运营商配置下发格式
+			SysDictInfoService service = SpringContextHolder.getBean(SysDictInfoService.class);
+			areaEffectiveIds = service.setEffectiveRange(areaEffectiveIds);
+		}
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
 }
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 6e2f80b0d..d79be0754 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -1265,6 +1265,7 @@ public abstract class BaseService {
 		ip.setIsValid(cfg.getIsValid());
 		ip.setOpTime(cfg.getAuditTime());
 		ip.setPolicyGroup(policyGroup);
+		ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());//添加区域管控
 		return ip;
 	}