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 { 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 { } } public void saveSslCfg(CfgIndexInfo entity){ + //设置区域运营商信息 + setAreaEffectiveIds(entity); if(entity.getCfgId()==null){ Integer compileId = 0; try {