From de83169636bec81e7f717d61a5ccc0377eb8e784 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 2 Apr 2018 11:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=BA=E9=AA=97ip=E9=85=8D=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E5=8F=91=E9=80=81=E7=BB=99=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=B1=82=E6=97=B6=E8=A1=A5=E4=B8=8Aclassify?=
 =?UTF-8?q?=E3=80=81attribute=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java     | 6 +++---
 .../com/nis/web/service/configuration/DnsIpCfgService.java | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java b/src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java
index 206c95c7d..e68b16e1a 100644
--- a/src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java
+++ b/src/main/java/com/nis/domain/maat/ToMaatDnsIpBean.java
@@ -20,7 +20,7 @@ public class ToMaatDnsIpBean implements Serializable {
 	@Expose
 	private String lable;
 	@Expose
-	private Integer requestId;
+	private Long requestId;
 	
 	public List<MaatDnsIpCfg> getServiceCfg() {
 		return serviceCfg;
@@ -52,10 +52,10 @@ public class ToMaatDnsIpBean implements Serializable {
 	public void setLable(String lable) {
 		this.lable = lable;
 	}
-	public Integer getRequestId() {
+	public Long getRequestId() {
 		return requestId;
 	}
-	public void setRequestId(Integer requestId) {
+	public void setRequestId(Long requestId) {
 		this.requestId = requestId;
 	}
 
diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
index 5afe0bcd5..c4b6b3143 100644
--- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
@@ -40,7 +40,14 @@ public class DnsIpCfgService extends CrudService<DnsIpCfgDao, DnsIpCfg>{
 		ipCfg.setIpCfg(d1);
 		ipCfgList.add(ipCfg);
 		toMaatBean.setServiceCfg(ipCfgList);
+		toMaatBean.setAttribute(dnsIpCfg.getAttribute());
+		toMaatBean.setClassify(dnsIpCfg.getClassify());
+		toMaatBean.setLable(dnsIpCfg.getLable());
+		toMaatBean.setIsValid(1);
+		toMaatBean.setRequestId(dnsIpCfg.getRequest().getId());
+		
 		String sendJson = gson.toJson(toMaatBean);
+		
 		logger.info("准备下发配置：" + sendJson);
 		//下发配置、接收结果
 		String recvJson = "";