From 82163c7af90191649dba9da9fcbedd9832be025d Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 4 Jun 2018 10:54:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E3=80=81=E9=9F=B3=E8=A7=86=E9=A2=91=E6=A0=B7=E4=BE=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=9D=E5=AD=98=E6=97=B6=E7=9A=84=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E4=BF=A1=E6=81=AF=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E9=9F=B3=E8=A7=86=E9=A2=91=E6=A0=B7=E4=BE=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E8=AF=B7=E6=B1=82json=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/java/com/nis/domain/maat/ToMaatResult.java  |  4 ++++
 .../nis/web/service/configuration/AvCfgService.java  | 12 ++++++++++--
 .../web/service/configuration/WebsiteCfgService.java |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/domain/maat/ToMaatResult.java b/src/main/java/com/nis/domain/maat/ToMaatResult.java
index aaf2ba90e..ec36e1e9d 100644
--- a/src/main/java/com/nis/domain/maat/ToMaatResult.java
+++ b/src/main/java/com/nis/domain/maat/ToMaatResult.java
@@ -11,6 +11,8 @@ package com.nis.domain.maat;
 import java.io.Serializable;
 import java.util.List;
 
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
 /**
  * @ClassName: ToMaatResult.java 
  * @Description: TODO
@@ -18,6 +20,7 @@ import java.util.List;
  * @date 2018年3月27日 下午5:10:01
  * @version V1.0
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class ToMaatResult implements Serializable{
 	/**
 	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
@@ -32,6 +35,7 @@ public class ToMaatResult implements Serializable{
 	private String msg;
 	private String fromuri;
 	private ResponseData data;
+	@JsonIgnoreProperties(ignoreUnknown=true)
 	public static class ResponseData{
 		private String sourceName;
 		private Integer num;
diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
index 93c517d84..a5e062578 100644
--- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
@@ -67,6 +67,8 @@ public class AvCfgService extends BaseService{
 		return page;
 	}
 	public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(new Date());
@@ -97,6 +99,8 @@ public class AvCfgService extends BaseService{
 		}
 	}
 	public void saveOrUpdateAvSignSample(AvSignSampleCfg entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(new Date());
@@ -161,8 +165,10 @@ public class AvCfgService extends BaseService{
 			cfg.setCompileId(entity.getCompileId());
 			cfg.setServiceId(entity.getServiceId());
 			list.add(cfg);
+			Map map = new HashMap();
+			map.put("updateStatCfgList", list);
 			//调用服务接口取消配置
-			String json=gsonToJson(list);
+			String json=gsonToJson(map);
 			logger.info("音视频文件样例下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.put(json,2);
@@ -199,8 +205,10 @@ public class AvCfgService extends BaseService{
 			cfg.setCompileId(entity.getCompileId());
 			cfg.setServiceId(entity.getServiceId());
 			list.add(cfg);
+			Map map = new HashMap();
+			map.put("updateStatCfgList", list);
 			//调用服务接口取消配置
-			String json=gsonToJson(list);
+			String json=gsonToJson(map);
 			logger.info("标志样例下发配置参数："+json);
 			//调用服务接口取消配置
 			ToMaatResult result = ConfigServiceUtil.put(json, 2);
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 5dc8039db..feb7dc693 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -109,6 +109,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		return page;
 	}
 	public void saveHttpCfg(CfgIndexInfo entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			Integer compileId = 0;
 			try {
@@ -427,6 +429,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		}
 	}
 	public void saveSslCfg(CfgIndexInfo entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			Integer compileId = 0;
 			try {