From 00b3ea807fc913b098634f14d9ce83dea53f6a4e Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Thu, 23 May 2019 18:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E9=87=8F=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91=E7=9B=AE=E7=9A=84=E5=9C=B0=E5=9D=80=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProxyFileTrafficMirrorCfgAudit.java       | 36 +++++++++++--------
 .../java/com/nis/web/service/BaseService.java |  5 ++-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
index 7bfa5ff7d..8b5ec4379 100644
--- a/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
+++ b/src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java
@@ -2,6 +2,7 @@ package com.nis.domain.callback;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.google.gson.annotations.Expose;
 
@@ -23,18 +24,13 @@ public class ProxyFileTrafficMirrorCfgAudit {
 	@Expose
 	private String profileName;
 	@Expose
-	private List<String> addrList;
+	private Map<String,List<String>> addrList;
+	@Expose
+	private String addrContent;
 	@Expose
 	private String addrType;
 	@Expose
 	private Long opUser;
-	
-	public Long getOpUser() {
-		return opUser;
-	}
-	public void setOpUser(Long opUser) {
-		this.opUser = opUser;
-	}
 	public Long getId() {
 		return id;
 	}
@@ -82,17 +78,29 @@ public class ProxyFileTrafficMirrorCfgAudit {
 	}
 	public void setProfileName(String profileName) {
 		this.profileName = profileName;
-	}	
+	}
+	public Map<String, List<String>> getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(Map<String, List<String>> addrList) {
+		this.addrList = addrList;
+	}
+	public String getAddrContent() {
+		return addrContent;
+	}
+	public void setAddrContent(String addrContent) {
+		this.addrContent = addrContent;
+	}
 	public String getAddrType() {
 		return addrType;
 	}
 	public void setAddrType(String addrType) {
 		this.addrType = addrType;
 	}
-	public List<String> getAddrList() {
-		return addrList;
+	public Long getOpUser() {
+		return opUser;
 	}
-	public void setAddrList(List<String> addrList) {
-		this.addrList = addrList;
-	}	
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}		
 }
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 7de689150..06e2d7109 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -3222,11 +3222,14 @@ public abstract class BaseService {
 	//流量转发目的地址
 	public static ProxyFileTrafficMirrorCfgAudit convertCallBackProxyFileTrafficMirror(ProxyFileTrafficMirrorCfg cfg) {
 		ProxyFileTrafficMirrorCfgAudit fileTemp = new ProxyFileTrafficMirrorCfgAudit();
+		Map map = new HashMap<String,List>();
+		map.put(cfg.getAddrType(),Arrays.asList(cfg.getAddrList().split(",")));
 		fileTemp.setId(Long.valueOf(cfg.getCompileId()));
 		fileTemp.setCfgId(cfg.getCompileId());
 		fileTemp.setProfileId(cfg.getCompileId());		
 		fileTemp.setProfileName(keywordsEscape(cfg.getCfgDesc()));
-		fileTemp.setAddrList(Arrays.asList(cfg.getAddrList().split(",")));
+		fileTemp.setAddrList(map);
+		fileTemp.setAddrContent(cfg.getAddrList());
 		fileTemp.setAddrType(cfg.getAddrType());
 		fileTemp.setAction(cfg.getAction());
 		fileTemp.setService(cfg.getServiceId());