1.生效区域下发格式修改 2.日志总量日志查询时间修改

src/main/java/com/nis/domain/maat/EffectiveRangeCfg.java

@@ -0,0 +1,50 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class EffectiveRangeCfg implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4503782443649076836L;
+	@Expose
+	@SerializedName("tag_sets")
+	private List<List<AreaIsp>> effectiveRangeList;
+	
+	public List<List<AreaIsp>> getEffectiveRangeList() {
+		return effectiveRangeList;
+	}
+
+	public void setEffectiveRangeList(List<List<AreaIsp>> effectiveRangeList) {
+		this.effectiveRangeList = effectiveRangeList;
+	}
+
+	public static class AreaIsp{
+		@Expose
+		private String tag;
+		@Expose
+		private List<String> value;
+		
+		public String getTag() {
+			return tag;
+		}
+		public void setTag(String tag) {
+			this.tag = tag;
+		}
+		public List<String> getValue() {
+			return value;
+		}
+		public void setValue(List<String> value) {
+			this.value = value;
+		}
+		@Override
+		public String toString() {
+			return "AreaIsp [tag=" + tag + ", value=" + value + "]";
+		}
+	}
+}

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -12,13 +12,14 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.StringUtils;
 import com.nis.web.service.BaseService;
+import com.nis.web.service.SpringContextHolder;
+import com.nis.web.service.basics.SysDictInfoService;
 
 /**
  * @ClassName: MaatCfg.java 
@@ -543,8 +544,10 @@ public class MaatCfg implements Serializable {
 	public void setAreaEffectiveIds(String areaEffectiveIds) {
 		if(StringUtils.isEmpty(areaEffectiveIds)){
 			areaEffectiveIds="0";
-		}else if(areaEffectiveIds.contains(":")){
-			areaEffectiveIds = areaEffectiveIds.replace(":", "");
+		}else {
+			// 组织区域、运营商配置下发格式
+			SysDictInfoService service = SpringContextHolder.getBean(SysDictInfoService.class);
+			areaEffectiveIds = service.setEffectiveRange(areaEffectiveIds);
 		}
 		this.areaEffectiveIds = areaEffectiveIds;
 	}