diff --git a/com.creditease.uav.agent.buildComponent/bin/run.sh b/com.creditease.uav.agent.buildComponent/bin/run.sh
index 2c5d3281..4f820367 100644
--- a/com.creditease.uav.agent.buildComponent/bin/run.sh
+++ b/com.creditease.uav.agent.buildComponent/bin/run.sh
@@ -47,7 +47,7 @@ export CLASSPATH=bin/com.creditease.uav.base-1.0-boot.jar
 echo $CLASSPATH
 javaAgent="-javaagent:../uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
 javaOpts="-server -Xms64m -Xmx256m -Xss256k -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC -XX:+UseCMSCompactAtFullCollection -XX:-CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=0 -XX:CMSInitiatingOccupancyFraction=70 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=."
-$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DJAppGroup=UNKNOWN -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1 &
+$executeJava $javaAgent $javaOpts -XX:OnOutOfMemoryError='kill -9 %p' -DNetCardIndex=$netcardIndex -DNetCardName=$netcardName -DJAppID=$2 -DJAppGroup=UAV -classpath $CLASSPATH com.creditease.mscp.boot.MSCPBoot -p $1 &
 
 # add crontab process watcher
 if [ "$proc_watcher" == "yes" ]; then
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css
index 0539a3dc..045c7162 100644
--- a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/css/uav.notifystgy.css
@@ -373,3 +373,21 @@ StgyDiv .edit-div-option:empty:before{
 /**
 *触发策略 end
 */
+
+.itemTitle {
+	text-align:left;
+	color:#333;
+	border-left:6px solid #57A69C;
+	padding-left:5px;
+	margin-bottom:2px;
+}
+
+.itemTip {
+	color:gray;
+	font-size:14px;
+	text-align:left;
+}
+
+.dateTimeInput {
+	width:120px;
+}
\ No newline at end of file
diff --git a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.win.js b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.win.js
index b0cd5c92..2e61cdc8 100644
--- a/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.win.js
+++ b/com.creditease.uav.console/src/main/webapp/uavapp_godeye/notifystgy/js/notifystgy.win.js
@@ -172,6 +172,7 @@ function showAddDiv() {
 
 	sb.append( '<div><button style="width:50%;margin-top:5px;min-width:340px;" class="btn btn-primary " onclick="javascript:saveNotify(true);">保存</button></div>');
 	sb.append( '<div><span id="addNotifyErrMSG" style="color:#ff0000;"></span></div>');
+	sb.append( '<div style="">&nbsp;</div>');
 	
 	sb.append( '</div>');
 
@@ -408,6 +409,7 @@ function showEditNotifyDiv(jsonObjParam) {
 		//按钮
 		sb.append( '<div><button style="width:50%;margin-top:5px;min-width:340px;" class="btn btn-primary " onclick="javascript:saveNotify(false);">修改</button></div>');
 		sb.append( '<div><span id="addNotifyErrMSG" style="color:#ff0000;"></span></div>');
+		sb.append( '<div style="">&nbsp;</div>');
 	}
 	
 	sb.append( '</div>');
@@ -547,24 +549,50 @@ function showCon(thisObj,type){
 				
 			var hour=jsonValue.time_from.split(':')[0];
 			var min=jsonValue.time_from.split(':')[1];
-			$('#time_start').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
+			$('#time_from_div').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
 			hour=jsonValue.time_to.split(':')[0];
 			min=jsonValue.time_to.split(':')[1];
-			$('#time_end').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
+			$('#time_to_div').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
+			
+			if(jsonValue.time_start!=undefined&&jsonValue.time_end!=undefined){
+				hour=jsonValue.time_start.split(':')[0];
+				min=jsonValue.time_start.split(':')[1];
+				$('#time_start_div').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
+				hour=jsonValue.time_end.split(':')[0];
+				min=jsonValue.time_end.split(':')[1];
+				$('#time_end_div').data('datetimepicker').setLocalDate(new Date(2000, 1, 1, hour, min));
+			}
+			
+			if(jsonValue.day_start!=undefined&&jsonValue.day_end!=undefined){
+				var year=jsonValue.day_start.split('-')[0];
+				var month=jsonValue.day_start.split('-')[1];
+				var day=jsonValue.day_start.split('-')[2];
+				$('#day_start_div').data('datetimepicker').setLocalDate(new Date(year, month-1, day, 0, 0));
+				year=jsonValue.day_end.split('-')[0];
+				month=jsonValue.day_end.split('-')[1];
+				day=jsonValue.day_end.split('-')[2];
+				$('#day_end_div').data('datetimepicker').setLocalDate(new Date(year, month-1, day, 0, 0));
+			}
+
+			showWeekDay(jsonValue.weekdayLimit);
 			
 			$("#conMetric").val(jsonValue.metric);
 			$("#conUpperLimit").val(jsonValue.upperLimit);
 			$("#conLowerLimit").val(jsonValue.lowerLimit);
 			$("#conAggr").val(jsonValue.aggr);
+			$("#conDownSample").val(jsonValue.downsample);
 			if(type=="link-relative"){
-				$("#conInterval").val(jsonValue.interval);
-				showUnit(jsonValue.unit);
-			}else{
-				showUnit(jsonValue.unit);
+				$("#conInterval").val(jsonValue.interval);				
 			}
+			showUnit(jsonValue.unit);
+			
 			if(isOwner!="true"){
 				$("#time_from").attr("readonly","readonly");
 				$("#time_to").attr("readonly","readonly");
+				$("#time_start").attr("readonly","readonly");
+				$("#time_end").attr("readonly","readonly");
+				$("#day_start").attr("readonly","readonly");
+				$("#day_end").attr("readonly","readonly");
 				$("#conMetric").attr("readonly","readonly");
 				$("#conUpperLimit").attr("readonly","readonly");
 				$("#conLowerLimit").attr("readonly","readonly");
@@ -572,6 +600,7 @@ function showCon(thisObj,type){
 				$("#conUpperLimit").attr("class","form-control");
 				$("#conLowerLimit").attr("class","form-control");
 				$("#conAggr").attr("disabled","disabled");
+				$("#conDownSample").attr("disabled","disabled");
 				if(type=="link-relative"){
 					$("#conInterval").attr("readonly","readonly");	
 					$("#conInterval").attr("class","form-control");	
@@ -588,6 +617,16 @@ function showUnit(unit){
 	$("#unit").val(unit);
 	$("#opt"+unit).attr("class","btn btn-default active");
 }
+
+function showWeekDay(weekdayLimit){
+
+    for(var i=0;i<weekdayLimit.length;i++){
+    	if(!weekdayLimit[i]){
+    		$("#weekday"+i).attr("class","btn btn-default");
+    	}   	
+    }
+	
+}
 /**
  * 条件定义页面 
  */
@@ -616,9 +655,9 @@ function showCondDiv(thisObj,type) {
 		 */
 		sb.append( '<div style="max-height:4000px;padding:5px;" id="stream">');
 		
-		sb.append( '<input id="contExpr" class=\"form-control input_must\" type=\"text\" placeholder=\"触发表达式\"></input><br/>');
-		sb.append( '<input id="conRange" class=\"form-control \" type=\"text\" placeholder=\"持续时间(秒)\" onkeyup="this.value=this.value.replace(\/\\D/g,\'\')" onafterpaste="this.value=this.value.replace(\/\\D/g,\'\')"></input><br/>');
-		sb.append( "<select class=\"form-control\"  id=\"conFunc\" onchange=\"javascript:funcChangeShow(this,'conFuncParam');\">");
+		sb.append( '<div class=\"itemTitle\">触发表达式</div><input id="contExpr" class=\"form-control input_must\" type=\"text\" placeholder=\"触发表达式\"></input><br/>');
+		sb.append( '<div class=\"itemTitle\">持续时间(秒)</div><input id="conRange" class=\"form-control \" type=\"text\" placeholder=\"持续时间(秒)\" onkeyup="this.value=this.value.replace(\/\\D/g,\'\')" onafterpaste="this.value=this.value.replace(\/\\D/g,\'\')"></input><br/>');
+		sb.append( "<div class=\"itemTitle\">聚集操作</div><select class=\"form-control\"  id=\"conFunc\" onchange=\"javascript:funcChangeShow(this,'conFuncParam');\">");
 		sb.append( '<option value="0">--选择聚集操作--</option>');
 		sb.append( '<option value="max">最大值</option>');
 		sb.append( '<option value="min">最小值</option>');
@@ -633,36 +672,109 @@ function showCondDiv(thisObj,type) {
 		/**
 		 * 同环比预警条件编辑
 		 */
-		sb.append( '<div id="timer" style="max-height:4000px;padding:5px;display:none;" >');		
-		sb.append('<div class="control-group">');
-		sb.append('<div id="time_start" class="controls input-append">');
-		sb.append('<span style="color:#333333;">开始时间：');
-		sb.append('<input size="16" data-format="hh:mm"  type="text" placeholder="开始时间" id="time_from"> ');
+		sb.append( '<div id="timer" style="max-height:4000px;padding:5px;display:none;" >');	
+		
+		sb.append('<div class="control-group" align="left">');
+		sb.append('<div class=\"itemTitle\">计算区间时间范围</div><span id="time_from_div" class="controls input-append">');
+		sb.append('<input class="dateTimeInput" size="14" data-format="hh:mm"  type="text" placeholder="计算区间开始时间" id="time_from">');
+		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
+		
+		sb.append('<span id="time_to_div" class="controls input-append">');
+		sb.append('<input class="dateTimeInput" size="14" data-format="hh:mm"  type="text" placeholder="计算区间结束时间" id="time_to">');
 		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
 		sb.append('</div>');
+			
+		sb.append('<div class="control-group" align="left">');
+		sb.append('<div class=\"itemTitle\">条件生效时间范围（可选）</div>');
+		sb.append('<span id="day_start_div" class="controls input-append">');
+		sb.append('<input class="dateTimeInput" size="14" data-format="yyyy-MM-dd"  type="text" placeholder="开始生效日期" id="day_start">');
+		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
+		sb.append('<span id="time_start_div" class="controls input-append">');		
+		sb.append('<input class="dateTimeInput" size="14" data-format="hh:mm"  type="text" placeholder="开始生效时间" id="time_start">');
+		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
 		sb.append('</div>');
 		
-		sb.append('<div class="control-group">');
-		sb.append('<div id="time_end" class="controls input-append">');
-		sb.append('<span style="color:#333333;">结束时间：');
-		sb.append('<input size="16" data-format="hh:mm"  type="text" placeholder="结束时间" id="time_to"> ');
+		sb.append('<div class="control-group" align="left">');
+		sb.append('<span id="day_end_div" class="controls input-append">');		
+		sb.append('<input class="dateTimeInput"  size="14" data-format="yyyy-MM-dd"  type="text" placeholder="结束生效日期" id="day_end">');
 		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
+		sb.append('<span id="time_end_div" class="controls input-append">');		
+		sb.append('<input class="dateTimeInput"  size="14" data-format="hh:mm"  type="text" placeholder="结束生效时间" id="time_end">');
+		sb.append('<span class="add-on"><i data-time-icon="icon-time" data-date-icon="icon-calendar"></i></span>');
+		sb.append('</span>');
 		sb.append('</div>');
+
+		sb.append('<div class="control-group" align="left">');
+		sb.append('<div  class="btn-group checkbox" data-toggle="buttons">');
+		sb.append('<label  class="btn btn-default active"  id="weekday0">');
+		sb.append('<input type="checkbox" name="Sun"/> 周日');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active"  id="weekday1">');
+		sb.append('<input type="checkbox" name="Mon"/> 周一');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active"  id="weekday2">');
+		sb.append('<input type="checkbox" name="Tues" /> 周二');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active" id="weekday3">');
+		sb.append('<input type="checkbox" name="Wed" /> 周三');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active"  id="weekday4">');
+		sb.append('<input type="checkbox" name="Thurs" /> 周四');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active" id="weekday5">');
+		sb.append('<input type="checkbox" name="Fri" /> 周五');
+		sb.append('</label>');
+		sb.append('<label  class="btn btn-default active" id="weekday6">');
+		sb.append('<input type="checkbox" name="Sat" /> 周六');
+		sb.append('</label>');
+		sb.append( '</div>'); 
 		sb.append('</div>');
-		
-		sb.append( '<input id="conMetric" class=\"form-control input_must\" type=\"text\" placeholder=\"预警指标项\"></input><br/>');
-		sb.append( '<input id="conUpperLimit" class=\"form-control input_must\" type=\"text\" placeholder=\"增幅上限阈值(以%结尾表示百分比，否则为绝对值，填-1表示无上限)\" onkeyup="this.value=this.value.replace((\/\\D|%)/g,\'\')" onafterpaste="this.value=this.value.replace((\/\\D|%),\'\')"></input><br/>');
-		sb.append( '<input id="conLowerLimit" class=\"form-control input_must\" type=\"text\" placeholder=\"降幅上限阈值(以%结尾表示百分比，否则为绝对值，填-1表示无下限)\" onkeyup="this.value=this.value.replace((\/\\D|%)/g,\'\')" onafterpaste="this.value=this.value.replace((\/\\D|%),\'\')"></input><br/>');
-		sb.append( "<select  class=\"form-control\" id=\"conAggr\" >");
-		sb.append( '<option value="0">--选择指标聚集操作--</option>');
+
+		sb.append( '<div class=\"itemTitle\">预警指标项</div><input id="conMetric" class=\"form-control input_must\" type=\"text\" placeholder=\"预警指标项\"></input><br/>');
+		sb.append( '<div class=\"itemTitle\">增幅上限阈值</div><div class="itemTip">以%结尾表示百分比，否则为绝对值，填*表示无上限。以#开始表示与#后数值比较，如#5表示计算区间内的聚集值大于5</div><input id="conUpperLimit" class=\"form-control input_must\" type=\"text\" placeholder=\"增幅上限阈值\" onkeyup="this.value=this.value.replace((\/\\D|%)/g,\'\')" onafterpaste="this.value=this.value.replace((\/\\D|%),\'\')"></input><br/>');
+		sb.append( '<div class=\"itemTitle\">降幅上限阈值</div><div class="itemTip">以%结尾表示百分比，否则为绝对值，填*表示无下限。以#开始表示与#后数值比较，如#5表示计算区间内的聚集值小于5</div><input id="conLowerLimit" class=\"form-control input_must\" type=\"text\" placeholder=\"降幅上限阈值\" onkeyup="this.value=this.value.replace((\/\\D|%)/g,\'\')" onafterpaste="this.value=this.value.replace((\/\\D|%),\'\')"></input><br/>');
+		sb.append( "<div class=\"itemTitle\">指标聚集操作(默认为平均值)</div><div class=\"itemTip\">计算区间内对该指标项的所有值的聚集操作</div><select  class=\"form-control\" id=\"conDownSample\" >");
+		sb.append( '<option value="0">--选择指标聚集操作(默认为平均值)--</option>');
 		sb.append( '<option value="all-avg">平均值</option>');
 		sb.append( '<option value="all-sum">求和</option>');
 		sb.append( '<option value="all-max">最大值</option>');
 		sb.append( '<option value="all-min">最小值</option>');
+		sb.append( '<option value="all-count">计数值</option>');
+		sb.append( '<option value="all-dev">标准差</option>');
+		sb.append( '<option value="all-first">开始值</option>');
+		sb.append( '<option value="all-last">末尾值</option>');
+		sb.append( '<option value="all-p50">50th百分位数</option>');
+		sb.append( '<option value="all-p75">75th百分位数</option>');
+		sb.append( '<option value="all-p90">90th百分位数</option>');
+		sb.append( '<option value="all-p95">95th百分位数</option>');
+		sb.append( '<option value="all-p99">99th百分位数</option>');
+		sb.append( '<option value="all-p999">999th百分位数</option>');
+		
+		sb.append( '</select><br/>');
+	    
+	    sb.append( "<div class=\"itemTitle\">范围聚集操作(默认为平均值)</div><div class=\"itemTip\">计算区间内对多个监控目标的该指标项的聚集操作结果的聚集操作</div><select  class=\"form-control\" id=\"conAggr\" >");
+		sb.append( '<option value="0">--选择范围聚集操作(默认为平均值)--</option>');
+		sb.append( '<option value="avg">平均值</option>');
+		sb.append( '<option value="sum">求和</option>');
+		sb.append( '<option value="max">最大值</option>');
+		sb.append( '<option value="min">最小值</option>');
+		sb.append( '<option value="count">计数值</option>');
+		sb.append( '<option value="dev">标准差</option>');
+		sb.append( '<option value="p50">50th百分位数</option>');
+		sb.append( '<option value="p75">75th百分位数</option>');
+		sb.append( '<option value="p90">90th百分位数</option>');
+		sb.append( '<option value="p95">95th百分位数</option>');
+		sb.append( '<option value="p99">99th百分位数</option>');
+		sb.append( '<option value="p999">999th百分位数</option>');
 		sb.append( '</select><br/>');
 		
-		sb.append('<div id="base-relative">')
-		sb.append('<span style="color:#333333;">选择同比周期  ');
+		sb.append('<div id="base-relative" align="left">')
+		sb.append('<div class=\"itemTitle\">同比周期</div>');
 		sb.append('<div  class="btn-group radio" data-toggle="buttons">');
 		sb.append('<label  class="btn btn-default"  id="opt4"  onclick="javascript:changeTimeUnit(4);">');
 		sb.append('<input type="radio" name="options" id="options4" value="year" /> 年');
@@ -680,7 +792,7 @@ function showCondDiv(thisObj,type) {
 		sb.append( '</div>'); 
 		
 		sb.append( '<div id="link-relative"> ' );		
-		sb.append( '<input id="conInterval" class=\"form-control input_must\"  type=\"text\" placeholder=\"环比间隔，填写间隔时间，下行选择单位\" onkeyup="this.value=this.value.replace(\/\\D/g,\'\')" onafterpaste="this.value=this.value.replace(\/\\D/g,\'\')"></input>');
+		sb.append( '<div class=\"itemTitle\">环比间隔</div><input id="conInterval" class=\"form-control input_must\"  type=\"text\" placeholder=\"环比间隔，填写间隔时间，下行选择单位\" onkeyup="this.value=this.value.replace(\/\\D/g,\'\')" onafterpaste="this.value=this.value.replace(\/\\D/g,\'\')"></input>');
 
 		sb.append('<div style="float:left;"  class="btn-group radio" data-toggle="buttons" id="unit">');
 		sb.append('<label class="btn btn-default" id="opt2" onclick="javascript:changeTimeUnit(2);">');
@@ -703,7 +815,7 @@ function showCondDiv(thisObj,type) {
 		/**
 		 * 保存按钮
 		 */
-		sb.append( '<div >');
+		sb.append( '<div style=\"margin-bottom:20px;\">');
 		sb.append( '<button style="width:100%" class="btn btn-primary " id=\"whereSaveButton\" onclick="javascript:conditionsAppend();">保存</button>');
 		sb.append( '<span style="margin-right:5px;color:#ff0000;display:none;" id="conditionsErrMsg">必输项不能为空</span>');
 		sb.append( '</div>');
@@ -739,18 +851,42 @@ function typeChangeShow(type){
  * 初始化时间控件
  */
 function initTimeControl(){
-	  $('#time_start').datetimepicker({
+	  $('#time_from_div').datetimepicker({
 	      pickDate: false,
 	      pickSeconds: false
 	  });
 
 
-	  $('#time_end').datetimepicker({
+	  $('#time_to_div').datetimepicker({
+	      pickDate: false,
+	      pickSeconds: false
+	  });
+
+	  $('#time_start_div').datetimepicker({
 	      pickDate: false,
 	      pickSeconds: false
 	  });
 
 
+	  $('#time_end_div').datetimepicker({
+	      pickDate: false,
+	      pickSeconds: false
+	  });
+
+	  $('#day_start_div').datetimepicker({
+	      pickHour: false,
+	      pickMin: false,
+	      pickSeconds: false
+	  });
+
+
+	  $('#day_end_div').datetimepicker({
+	      pickHour: false,
+	      pickMin: false,
+	      pickSeconds: false
+	  });
+
+
 }
 
 function changeTimeUnit(value){
@@ -897,13 +1033,43 @@ function conditionsAppend(){
 		if("stream"==$("#condType").val()){		
 			jsonObject = {"type":"stream","expr":HtmlHelper.inputXSSFilter($("#contExpr").val()),"range":HtmlHelper.inputXSSFilter($("#conRange").val()),"func":HtmlHelper.inputXSSFilter($("#conFunc").val()),"cparam":HtmlHelper.inputXSSFilter($("#conFuncParam").val())};		
 		}else{			
-			jsonObject = {"type":"timer","time_from":HtmlHelper.inputXSSFilter($("#time_from").val()),"time_to":HtmlHelper.inputXSSFilter($("#time_to").val()),"metric":HtmlHelper.inputXSSFilter($("#conMetric").val()),"upperLimit":HtmlHelper.inputXSSFilter($("#conUpperLimit").val()),"lowerLimit":HtmlHelper.inputXSSFilter($("#conLowerLimit").val()),"aggr":HtmlHelper.inputXSSFilter($("#conAggr").val())};		
+			jsonObject = {"type":"timer","time_from":HtmlHelper.inputXSSFilter($("#time_from").val()),"time_to":HtmlHelper.inputXSSFilter($("#time_to").val()),"metric":HtmlHelper.inputXSSFilter($("#conMetric").val()),"upperLimit":HtmlHelper.inputXSSFilter($("#conUpperLimit").val()),"lowerLimit":HtmlHelper.inputXSSFilter($("#conLowerLimit").val())};		
+
+			if(HtmlHelper.inputXSSFilter($("#conAggr").val())!="0"){
+				jsonObject["aggr"]=HtmlHelper.inputXSSFilter($("#conAggr").val());				
+			}else{
+				jsonObject["aggr"]="avg";	
+			}
+
+			if(HtmlHelper.inputXSSFilter($("#conDownSample").val())!="0"){
+				jsonObject["downsample"]=HtmlHelper.inputXSSFilter($("#conDownSample").val());				
+			}else{
+				jsonObject["downsample"]="all-avg";
+			}
+
 			if("link-relative"==$("#condType").val()){
 				jsonObject["interval"]=HtmlHelper.inputXSSFilter($("#conInterval").val());
 				jsonObject["unit"]=HtmlHelper.inputXSSFilter($("#unit").val());
 			}else{
 				jsonObject["unit"]=HtmlHelper.inputXSSFilter($("#unit").val());
 			}
+			
+			if($("#time_start").val()&&$("#time_end").val()){
+				jsonObject["time_start"]=HtmlHelper.inputXSSFilter($("#time_start").val());
+				jsonObject["time_end"]=HtmlHelper.inputXSSFilter($("#time_end").val());
+			}
+			
+			if($("#day_start").val()&&$("#day_end").val()){
+				jsonObject["day_start"]=HtmlHelper.inputXSSFilter($("#day_start").val());
+				jsonObject["day_end"]=HtmlHelper.inputXSSFilter($("#day_end").val());
+			}
+			
+			var weekdayLimit=[];
+			for(var i=0;i<7;i++){
+				weekdayLimit[i]=($("#weekday"+i).attr("class")=="btn btn-default active")
+			}			
+			jsonObject["weekdayLimit"]=weekdayLimit;
+			
 		}
 		appendConditions(jsonObject);
 		window.winmgr.hide("condDiv");
@@ -921,7 +1087,7 @@ function checkFunc(){
 			result = false;
 		}
 	}else{
-		if(!$("#time_from").val()||!$("#time_to").val()||!$("#conMetric").val()||!$("#conUpperLimit").val()||!$("#conLowerLimit").val()||!$("#conAggr").val()){
+		if(!$("#time_from").val()||!$("#time_to").val()||!$("#conMetric").val()||!$("#conUpperLimit").val()||!$("#conLowerLimit").val()){
 			result = false;
 		}
 		if("link-relative"==$("#condType").val()){
@@ -1432,7 +1598,7 @@ var StgyClass = {
 				result += ","+json.func;
 			}
 		}else{
-			result = json.metric+","+json.time_from+"-"+json.time_to+","+json.aggr+",";
+			result = json.metric+","+json.time_from+"-"+json.time_to+","+json.downsample+","+json.aggr+",";
 			if(json.interval){
 				result+=json.interval+" ";
 				
@@ -1456,7 +1622,13 @@ var StgyClass = {
 				case "4":
 					result+="year";	
 					break;
-			}								
+			}
+			if(json.time_start!=undefined&&json.time_end!=undefined){
+				result+=","+json.time_start+"-"+json.time_end;	
+			}
+			if(json.day_start!=undefined&&json.day_end!=undefined){
+				result+=","+json.day_start+"-"+json.day_end;	
+			}
 		}			
 		
 		return result;
diff --git a/com.creditease.uav.elasticsearch.client/src/main/java/com/creditease/uav/elasticsearch/client/ESClient.java b/com.creditease.uav.elasticsearch.client/src/main/java/com/creditease/uav/elasticsearch/client/ESClient.java
index 40655776..fbc562a5 100644
--- a/com.creditease.uav.elasticsearch.client/src/main/java/com/creditease/uav/elasticsearch/client/ESClient.java
+++ b/com.creditease.uav.elasticsearch.client/src/main/java/com/creditease/uav/elasticsearch/client/ESClient.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
@@ -111,11 +111,24 @@ public boolean existIndex(String index) {
      * 
      * @param index
      * @return
+     * @throws IOException
      */
-    public boolean creatIndex(String index) {
+    public boolean creatIndex(String index) throws IOException {
+
+        return creatIndex(index, null, null, null);
+    }
+
+    public boolean creatIndex(String index, String type, Map<String, String> set,
+            Map<String, Map<String, Object>> mapping) throws IOException {
 
-        CreateIndexRequest cir = new CreateIndexRequest(index);
-        CreateIndexResponse resp = client.admin().indices().create(cir).actionGet();
+        CreateIndexRequestBuilder createIndexRequestBuilder = client.admin().indices().prepareCreate(index);
+        if (type != null && mapping != null) {
+            createIndexRequestBuilder.addMapping(type, createMapping(type, mapping));
+        }
+        if (set != null) {
+            createIndexRequestBuilder.setSettings(createSetting(set));
+        }
+        CreateIndexResponse resp = createIndexRequestBuilder.execute().actionGet();
 
         if (resp.isAcknowledged()) {
             return true;
@@ -124,6 +137,42 @@ public boolean creatIndex(String index) {
         return false;
     }
 
+    private Settings createSetting(Map<String, String> set) {
+
+        Settings settings = Settings.builder().put(set).build();
+
+        return settings;
+    }
+
+    private XContentBuilder createMapping(String type, Map<String, Map<String, Object>> properties) throws IOException {
+
+        XContentBuilder mapping;
+
+        mapping = jsonBuilder().startObject().startObject(type);
+
+        mapping = mapping.startObject("properties");
+
+        for (String key : properties.keySet()) {
+            mapping = mapping.startObject(key);
+
+            Map<String, Object> fv = properties.get(key);
+
+            for (String field : fv.keySet()) {
+                mapping = mapping.field(field, fv.get(field));
+            }
+
+            mapping = mapping.endObject();
+        }
+
+        mapping = mapping.endObject();
+
+        mapping = mapping.endObject();
+
+        mapping = mapping.endObject();
+
+        return mapping;
+    }
+
     /**
      * existType
      * 
@@ -173,29 +222,7 @@ public boolean updateIndexSetting(String index, Map<String, Object> set) {
     public boolean setIndexTypeMapping(String index, String type, Map<String, Map<String, Object>> properties)
             throws IOException {
 
-        XContentBuilder mapping;
-
-        mapping = jsonBuilder().startObject();
-
-        mapping = mapping.startObject("properties");
-
-        for (String key : properties.keySet()) {
-            mapping = mapping.startObject(key);
-
-            Map<String, Object> fv = properties.get(key);
-
-            for (String field : fv.keySet()) {
-                mapping = mapping.field(field, fv.get(field));
-            }
-
-            mapping = mapping.endObject();
-        }
-
-        mapping = mapping.endObject();
-
-        mapping = mapping.endObject();
-
-        PutMappingRequest pmp = Requests.putMappingRequest(index).type(type).source(mapping);
+        PutMappingRequest pmp = Requests.putMappingRequest(index).type(type).source(createMapping(type, properties));
         PutMappingResponse resp = client.admin().indices().putMapping(pmp).actionGet();
 
         return resp.isAcknowledged();
diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/messaging/AbstractMessageHandler.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/messaging/AbstractMessageHandler.java
index 19fac22d..9fe54b54 100644
--- a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/messaging/AbstractMessageHandler.java
+++ b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/healthmanager/messaging/AbstractMessageHandler.java
@@ -79,8 +79,16 @@ public void handle(Message msg) {
             // pre insert to process DataStoreMsg
             preInsert(dsMsg);
 
-            // do insert
-            boolean insertR = store.doInsert(dsMsg);
+            boolean insertR = false;
+
+            try {
+                // do insert
+                insertR = store.doInsert(dsMsg);
+
+            }
+            catch (Exception e) {
+                log.err(this, "DataStore[" + msgKey + "] INSERT DATA FAIL!", e);
+            }
 
             if (log.isDebugEnable()) {
 
diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/NotifyStrategy.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/NotifyStrategy.java
index 147218cc..b8d163ef 100644
--- a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/NotifyStrategy.java
+++ b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/NotifyStrategy.java
@@ -29,6 +29,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.alibaba.fastjson.JSONArray;
 import com.creditease.agent.helpers.DateTimeHelper;
 import com.creditease.agent.helpers.EncodeHelper;
 import com.creditease.agent.helpers.JSONHelper;
@@ -282,7 +283,9 @@ protected static class Expression {
         private long range = 0;
         private String func;
         private float sampling = 1;
-
+        private String downsample;
+        private Boolean[] weekdayLimit=new Boolean[] {true,true,true,true,true,true,true};
+        
         private Set<String> matchArgExpr = new HashSet<String>();
 
         private long time_from;
@@ -291,7 +294,11 @@ protected static class Expression {
         private int unit;
         private String upperLimit;
         private String lowerLimit;
-
+        private String time_end;
+        private String time_start;
+        private String day_start;
+        private String day_end;
+        
         public Expression(String exprStr) {
             for (String op : OPERATORS) {
                 if (exprStr.contains(op)) {
@@ -331,6 +338,19 @@ public Expression(Map<String, Object> cond) {
             this.time_to = DateTimeHelper
                     .dateFormat(DateTimeHelper.getToday("yyyy-MM-dd") + " " + cond.get("time_to"), "yyyy-MM-dd HH:mm")
                     .getTime();
+            
+            this.time_start=(String) cond.get("time_start");
+            
+            this.time_end= (String) cond.get("time_end");
+            
+            this.day_start=(String) cond.get("day_start");
+            
+            this.day_end= (String) cond.get("day_end");
+            
+            if(cond.containsKey("weekdayLimit")) {
+                ((JSONArray)cond.get("weekdayLimit")).toArray(this.weekdayLimit);
+            }       
+            
             if (cond.get("interval") != null) {
                 long interval = Long.parseLong((String) cond.get("interval"));
                 switch (unit) {
@@ -350,6 +370,7 @@ public Expression(Map<String, Object> cond) {
             this.upperLimit = (String) cond.get("upperLimit");
             this.lowerLimit = (String) cond.get("lowerLimit");
             this.func = (String) cond.get("aggr");
+            this.downsample=(String) cond.get("downsample");
             this.type = Type.TIMER;
         }
 
@@ -469,6 +490,36 @@ public void setIdx(int idx) {
 
             this.idx = idx;
         }
+        
+        public String getTime_end() {
+
+            return time_end;
+        }
+
+        public String getTime_start() {
+
+            return time_start;
+        }
+
+        public String getDownsample() {
+
+            return downsample;
+        }
+
+        public String getDay_start() {
+
+            return day_start;
+        }
+
+        public String getDay_end() {
+
+            return day_end;
+        }
+
+        public Boolean[] getWeekdayLimit() {
+
+            return weekdayLimit;
+        }
 
     }
 
diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/StrategyJudgement.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/StrategyJudgement.java
index 78542f67..3615fb7c 100644
--- a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/StrategyJudgement.java
+++ b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/StrategyJudgement.java
@@ -57,12 +57,30 @@ public class StrategyJudgement extends AbstractComponent {
         readable.put("all-max", "最大");
         readable.put("all-min", "最小");
         readable.put("all-sum", "总和");
+        readable.put("all-count", "计数");
+        readable.put("all-dev", "标准差");
+        readable.put("all-first", "开始");
+        readable.put("all-last", "末尾");
+        readable.put("all-p50", "50th百分位数");
+        readable.put("all-p75", "75th百分位数");
+        readable.put("all-p90", "90th百分位数");
+        readable.put("all-p95", "95th百分位数");
+        readable.put("all-p99", "99th百分位数");
+        readable.put("all-p999", "999th百分位数");
+        
         readable.put("avg", "平均");
         readable.put("max", "最大");
         readable.put("min", "最小");
         readable.put("sum", "总和");
         readable.put("diff", "差");
         readable.put("count", "计数");
+        readable.put("dev", "标准差");
+        readable.put("p50", "50th百分位数");
+        readable.put("p75", "75th百分位数");
+        readable.put("p90", "90th百分位数");
+        readable.put("p95", "95th百分位数");
+        readable.put("p99", "99th百分位数");
+        readable.put("p999", "999th百分位数");
     }
 
     private CacheManager cm;
@@ -248,10 +266,14 @@ private void judgeTimerExpression(ConditionResult cr, NotifyStrategy.Expression
         if (judgeResult == null) {
             judgeResult = new HashMap<String, Object>();
             judgeResult.put("fire", false);
+        }else {
+            log.debug(this, "judgeTimerExpression judgeResult:" + JSONHelper.toString(judgeResult));
         }
 
+        Map<String, Object> args = slice.getArgs();
+
         // if the judge is called by slice stream, just return the last result
-        if (slice.getKey().indexOf('@') > -1) {
+        if (args == null || !"timer".equals(args.get("creater"))) {
             if (judgeResult.get("time_to") != null) {
                 Date date = DateTimeHelper.dateFormat(String.valueOf(judgeResult.get("time_to")), "yyyy-MM-dd HH:mm");
                 // if the time is not the time expr's judge time,return false
@@ -275,12 +297,66 @@ && isOverdue(DateTimeHelper
             }
             else if (timeMap != null) {
                 caculateJudgeResult(timeMap, judgeResult, slice.getKey(), expr, cr);
+                
+                if((Boolean) judgeResult.get("fire")) {
+                    //add detail info
+                    addDetail(timeMap,slice,expr);
+                }
             }
 
-        }
+        }      
 
         cr.addTimerExprResult((Boolean) judgeResult.get("fire"), expr, judgeResult);
     }
+    
+    private void addDetail(Map<String, Long> timeMap, Slice slice, Expression expr) {        
+
+        
+        Map<String, Object> args=slice.getArgs();
+
+        String metric=expr.getArg();
+        
+        if(args.containsKey("currentDetailValue_"+metric)) {
+            return;
+        }
+        
+        Map<String,String>  currentDetailValue = queryDetailValue(slice.getKey(),expr,timeMap.get("time_from"),timeMap.get("time_to"));
+        
+        Map<String,String>  lastDetailValue = queryDetailValue(slice.getKey(),expr,timeMap.get("last_time_from"),timeMap.get("last_time_to"));
+       
+        args.put("currentDetailValue_"+metric, currentDetailValue);
+        
+        args.put("lastDetailValue_"+metric, lastDetailValue);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private Map<String, String> queryDetailValue(String instance, Expression expr, Long startTime, Long endTime) {
+        
+        Map<String,String> detail = new LinkedHashMap<String,String>();
+        
+        String data = buildQueryJSON(instance,expr,startTime,endTime,true);                
+        
+        List<Map> resultList = queryOpentsdb(data);
+        
+        if(resultList==null) {
+            return detail;
+        }
+        
+        for(Map result:resultList) {
+            
+            String instid=String.valueOf(((Map)result.get("tags")).get("instid"));
+            
+            for(Object value:((Map)result.get("dps")).values()) {
+                
+                detail.put(instid, String.valueOf(value));
+                
+                break;
+            }            
+        }
+        
+        return detail;
+        
+    }
 
     private void caculateJudgeResult(Map<String, Long> timeMap, Map<String, Object> judgeResult, String instance,
             Expression expr, ConditionResult cr) {
@@ -291,19 +367,23 @@ private void caculateJudgeResult(Map<String, Long> timeMap, Map<String, Object>
             return;
         }
 
-        Double currentValue = queryOpentsdb(instance, expr.getArg(), expr.getFunc(), timeMap.get("time_from"),
+        Double currentValue = queryValue(instance, expr, timeMap.get("time_from"),
                 timeMap.get("time_to"));
         Double lastValue = 0.0;
 
+        if ((expr.getLowerLimit().contains("#") || expr.getLowerLimit().contains("*"))
+                && (expr.getUpperLimit().contains("#") || expr.getUpperLimit().contains("*"))) {
+            // do nothing
+        }
         // if the last judgeResult is really the last judgeTime's result, use it's currentValue as lastValue.
-        if (judgeResult.get("time_to") != null
+        else if (judgeResult.get("time_to") != null
                 && judgeResult.get("time_to")
                         .equals(DateTimeHelper.toFormat("yyyy-MM-dd HH:mm", timeMap.get("last_time_to")))
                 && judgeResult.get("currentValue") != null) {
             lastValue = Double.parseDouble(String.valueOf(judgeResult.get("currentValue")));
         }
         else {
-            lastValue = queryOpentsdb(instance, expr.getArg(), expr.getFunc(), timeMap.get("last_time_from"),
+            lastValue = queryValue(instance, expr, timeMap.get("last_time_from"),
                     timeMap.get("last_time_to"));
         }
 
@@ -346,68 +426,83 @@ private boolean caculate(double currentValue, double lastValue, NotifyStrategy.E
 
         boolean result = false;
 
-        String limitString = null;
-
         double diff = currentValue - lastValue;
 
-        String prefix = (diff > 0) ? "" : "-";
-
-        diff = (diff > 0) ? diff : 0 - diff;
+        String limitString = null;
 
-        limitString = (diff >= 0) ? expr.getUpperLimit() : expr.getLowerLimit();
+        String upperLimitString = expr.getUpperLimit();
+        String lowerLimitString = expr.getLowerLimit();
+        // 增幅or降幅
+        String upperORlower = "";
+        double upperLimit = 0;
+        double lowerLimit = 0;
+        // get upperLimit
+        if (upperLimitString.contains("#")) {
+            upperLimit = Double.parseDouble(upperLimitString.substring(upperLimitString.indexOf('#') + 1));
+        }
+        else if (upperLimitString.contains("%")) {
+            upperLimit = Double.parseDouble(upperLimitString.substring(0, upperLimitString.indexOf('%')));
+            diff = diff * 100 / lastValue;
+        }
+        else if (!upperLimitString.contains("*")) {
+            upperLimit = Double.parseDouble(upperLimitString);
+        }
 
-        double limit;
-        String suffix = "";
-        if (limitString.endsWith("%")) {
-            limit = Double.parseDouble(limitString.substring(0, limitString.length() - 1));
+        // get lowerLimit
+        if (lowerLimitString.contains("#")) {
+            lowerLimit = 0 - Double.parseDouble(lowerLimitString.substring(lowerLimitString.indexOf('#') + 1));
+        }
+        else if (lowerLimitString.contains("%")) {
+            lowerLimit = Double.parseDouble(lowerLimitString.substring(0, lowerLimitString.indexOf('%')));
             diff = diff * 100 / lastValue;
-            suffix = "%";
         }
-        else {
-            limit = Double.parseDouble(limitString);
+        else if (!lowerLimitString.contains("*")) {
+            lowerLimit = Double.parseDouble(lowerLimitString);
         }
 
-        if (!"-1".equals(limitString) && diff > limit) {
+        if (!upperLimitString.contains("*") && diff > upperLimit) {
+            result = true;
+            upperORlower = "upper";
+            limitString = upperLimitString;
+        }
+        else if (!lowerLimitString.contains("*") && diff < 0 - lowerLimit) {
             result = true;
+            upperORlower = "lower";
+            limitString = lowerLimitString;
         }
 
-        judgeResult.put("actualValue", prefix + String.format("%.2f", diff) + suffix);
+        judgeResult.put("actualValue", String.format("%.2f", diff) + (limitString.contains("%") ? "%" : ""));
         judgeResult.put("expectedValue", limitString);
-
+        judgeResult.put("upperORlower", upperORlower);
         return result;
 
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private Double queryOpentsdb(String instance, String metric, String func, Long startTime, Long endTime) {
+    @SuppressWarnings({"rawtypes" })
+    private Double queryValue(String instance, Expression expr, Long startTime, Long endTime) {
 
         Double result = null;
-        for (int i = 0; i < 3 && result == null; i++) {
+        for (int i = 0; i < 3; i++) {
 
-            try {
-                UAVHttpMessage message = new UAVHttpMessage();
+            try {              
 
-                String data = String.format(
-                        "{\"start\":%d,\"end\":%d,\"queries\":[{\"aggregator\":\"avg\",\"downsample\":\"%s\",\"metric\":\"%s\",\"filters\":[{\"filter\":\"%s\",\"tagk\":\"instid\",\"type\":\"regexp\",\"groupBy\":false}]}]}",
-                        startTime, endTime, func, metric,
-                        instance.replace(":", "/u003a").replace("%", "/u0025").replace("#", "/u0023"));
-                message.putRequest("opentsdb.query.json", data);
-                message.putRequest("datastore.name", MonitorDataFrame.MessageType.Monitor.toString());
+                String data = buildQueryJSON(instance,expr,startTime,endTime,false);                
 
-                String queryResponse = String.valueOf(invoker.invoke(queryServiceName, message, String.class));
-
-                if (queryResponse.equals("null") || queryResponse.equals("{}")
-                        || queryResponse.equals("{\"rs\":\"[]\"}")) {
+                List<Map> resultList = queryOpentsdb(data);                
+                
+                if(resultList==null) {
                     continue;
                 }
-
-                Map<Object, Object> responseMap = JSONHelper.toObject(queryResponse, Map.class);
-
-                List<Map> rsList = JSONHelper.toObjectArray((String) responseMap.get(UAVHttpMessage.RESULT), Map.class);
-
-                for (Object value : ((Map) rsList.get(0).get("dps")).values()) {
+                
+                for (Object value : ((Map) resultList.get(0).get("dps")).values()) {
+                    
                     result = ((BigDecimal) value).doubleValue();
-                }
+                    
+                    if(result!=null) {
+                        return result;
+                    }
+                }                
+                
             }
             catch (Exception e) {
                 log.err(this, "TimerExpression judgement query opentsdb failed ", e);
@@ -416,6 +511,38 @@ private Double queryOpentsdb(String instance, String metric, String func, Long s
         return result;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private List<Map> queryOpentsdb(String data) {
+
+        UAVHttpMessage message = new UAVHttpMessage();               
+        
+        message.putRequest("opentsdb.query.json", data);
+        message.putRequest("datastore.name", MonitorDataFrame.MessageType.Monitor.toString());
+
+        String queryResponse = String.valueOf(invoker.invoke(queryServiceName, message, String.class));
+        
+        if (queryResponse.equals("null") || queryResponse.equals("{}")
+                || queryResponse.equals("{\"rs\":\"[]\"}")) {
+            return null;
+        }
+
+        Map<Object, Object> responseMap = JSONHelper.toObject(queryResponse, Map.class);
+
+        List<Map> rsList = JSONHelper.toObjectArray((String) responseMap.get(UAVHttpMessage.RESULT), Map.class);
+        
+        return rsList;
+    }
+
+    private String buildQueryJSON(String instance, Expression expr, Long startTime, Long endTime, boolean groupBy) {
+        
+        String data=String.format(
+                    "{\"start\":%d,\"end\":%d,\"queries\":[{\"aggregator\":\"%s\",\"downsample\":\"%s\",\"metric\":\"%s\",\"filters\":[{\"filter\":\"%s\",\"tagk\":\"instid\",\"type\":\"regexp\",\"groupBy\":%b}]}]}",
+                    startTime, endTime, expr.getFunc(), expr.getDownsample(), expr.getArg(),
+                    instance.replace(":", "/u003a").replace("%", "/u0025").replace("#", "/u0023"),groupBy);
+            
+        return data;
+    }
+    
     /**
      * get judgeResult from redis
      */
@@ -441,6 +568,11 @@ private Map<String, Object> getJudgeResult(String instance, Expression expr) {
      * else return null;
      */
     private Map<String, Long> getJudgeTime(Expression expr, long time) {
+        
+
+        if (!inTimeScope(expr, time)) {
+            return null;
+        }
 
         Map<String, Long> timeMap = new HashMap<String, Long>();
         long time_to = time;
@@ -494,6 +626,48 @@ private Map<String, Long> getJudgeTime(Expression expr, long time) {
 
         return timeMap;
     }
+    
+    /**
+     * return true if the time is in judge time scope
+     */
+    private boolean inTimeScope(Expression expr, long time) {
+
+        String time_start = expr.getTime_start();
+        String time_end = expr.getTime_end();
+        String day_start = expr.getDay_start();
+        String day_end = expr.getDay_end();
+
+        if (!StringHelper.isEmpty(day_start) && !StringHelper.isEmpty(day_end)) {
+
+            long startTime = DateTimeHelper.dateFormat(day_start, "yyyy-MM-dd").getTime();
+            long endTime = DateTimeHelper.dateFormat(day_end, "yyyy-MM-dd").getTime();
+
+            if (time < startTime || time >= endTime + 24 * 3600 * 1000) {
+                return false;
+            }
+        }
+
+        if (!StringHelper.isEmpty(time_start) && !StringHelper.isEmpty(time_end)) {
+
+            long startTime = DateTimeHelper
+                    .dateFormat(DateTimeHelper.getToday("yyyy-MM-dd") + " " + time_start, "yyyy-MM-dd HH:mm").getTime();
+            long endTime = DateTimeHelper
+                    .dateFormat(DateTimeHelper.getToday("yyyy-MM-dd") + " " + time_end, "yyyy-MM-dd HH:mm").getTime();
+
+            if (time < startTime || time >= endTime) {
+                return false;
+            }
+        }
+
+        int weekday = DateTimeHelper.getWeekday(new Date(time));
+        
+        if(expr.getWeekdayLimit()!=null&&!expr.getWeekdayLimit()[weekday]) {
+            return false;
+        }
+        
+        return true;
+    }
+
 
     private List<Slice> rangeSlices(List<Slice> slices, Slice cur, long range) {
 
@@ -637,13 +811,33 @@ private String makeReadableString(Map<String, String> m) {
             }
             else if (NotifyStrategy.Type.TIMER.toString().equals(m.get("type"))) {
 
-                description = ("true".equals(m.get("fire"))) ? String.format(
-                        "%s在%s至%s时间段的%s值%s比%s至%s%s超过%s，当前值：%s。上期值：%s，本期值：%s", m.get("metric"), m.get("time_from"),
-                        m.get("time_to"), readable.get(m.get("func")), m.get("tag"), m.get("last_time_from"),
-                        m.get("last_time_to"), (m.get("actualValue").contains("-")) ? "降幅" : "增幅",
-                        m.get("expectedValue"),
-                        (m.get("actualValue").contains("-")) ? m.get("actualValue").substring(1) : m.get("actualValue"),
-                        m.get("lastValue"), m.get("currentValue")) : "false";
+                if (m.get("expectedValue").contains("#")) {
+                    double expectedValue = Double
+                            .parseDouble(m.get("expectedValue").substring(m.get("expectedValue").indexOf('#') + 1));
+                    double actualValue = Double.parseDouble(m.get("actualValue"));
+                    description = ("true".equals(m.get("fire"))) ? String.format("%s在%s至%s时间段的%s值%s%s，当前值：%s。",
+                            m.get("metric"), m.get("time_from"), m.get("time_to"), readable.get(m.get("downsample")),
+                            (actualValue > expectedValue) ? ">" : "<", String.valueOf(expectedValue),
+                            String.valueOf(actualValue)) : "false";
+                }
+                else {
+                    description = ("true".equals(m.get("fire"))) ? String.format(
+                            "%s在%s至%s时间段的%s值%s比%s至%s%s%s%s，当前值：%s。上期值：%s，本期值：%s", m.get("metric"), m.get("time_from"),
+                            m.get("time_to"), readable.get(m.get("downsample")), m.get("tag"), m.get("last_time_from"),
+                            m.get("last_time_to"),
+                            (m.get("upperORlower").equals("upper") && !m.get("expectedValue").contains("-"))
+                                    || (m.get("upperORlower").equals("lower") && m.get("expectedValue").contains("-"))
+                                            ? "增幅"
+                                            : "降幅",
+                            m.get("expectedValue").contains("-") ? "低于" : "超过",
+                            (m.get("expectedValue").contains("-")) ? m.get("expectedValue").substring(1)
+                                    : m.get("expectedValue"),
+                            (m.get("upperORlower").equals("upper") && m.get("expectedValue").contains("-"))
+                                    || (m.get("upperORlower").equals("lower") && !m.get("expectedValue").contains("-"))
+                                            ? String.valueOf(0 - Double.parseDouble(m.get("actualValue")))
+                                            : m.get("actualValue"),
+                            m.get("lastValue"), m.get("currentValue")) : "false";
+                }
             }
 
             return description;
@@ -683,6 +877,7 @@ public void addTimerExprResult(boolean result, NotifyStrategy.Expression expr, M
             m.put("tag", expr.getInterval() == 0 ? "同" : "环");
             m.put("metric", expr.getArg().substring(expr.getArg().indexOf('.') + 1));
             m.put("func", expr.getFunc());
+            m.put("downsample", expr.getDownsample());
             m.put("type", NotifyStrategy.Type.TIMER.toString());
             addExprResult(idx++, result, m);
         }
diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/task/JudgeNotifyTimerTask.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/task/JudgeNotifyTimerTask.java
index 0a642bd6..3497b89e 100644
--- a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/task/JudgeNotifyTimerTask.java
+++ b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/runtimenotify/task/JudgeNotifyTimerTask.java
@@ -21,6 +21,7 @@
 package com.creditease.uav.feature.runtimenotify.task;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -73,7 +74,14 @@ public void run() {
 
                 StrategyJudgement judgement = (StrategyJudgement) getConfigManager().getComponent(feature,
                         "StrategyJudgement");
-                Map<String, String> result = judgement.judge(new Slice(instance, judge_time), stra, null);
+                
+                Slice slice = new Slice(instance, judge_time);
+                Map<String, Object> args = new HashMap<String, Object>();
+                // 标识该slice由TimerTask创建，为同环比创建，非流式计算创建
+                args.put("creater", "timer");
+                slice.setArgs(args);
+                
+                Map<String, String> result = judgement.judge(slice, stra, null);
 
                 /**
                  * Step 3: if fire the event, build notification event
@@ -82,7 +90,7 @@ public void run() {
                     NotificationEvent event = this.newNotificationEvent(instance, result, stra.getConvergences());
 
                     // get context
-                    putContext(event);
+                    putContext(slice,event);
 
                     // get action
                     putNotifyAction(event, stra);
@@ -120,8 +128,18 @@ public void run() {
      * 
      * TODO: we need support context param in strategy
      */
-    private void putContext(NotificationEvent event) {
+    private void putContext(Slice slice, NotificationEvent event) {
+        
+        Map<String, Object> args = slice.getArgs();
+
+        for (String key : args.keySet()) {
+
+            Object argVal = args.get(key);
 
+            String jsonstr = JSONHelper.toString(argVal);
+
+            event.addArg(key, jsonstr);
+        }
     }
 
     /**
diff --git a/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DataStoreHelper.java b/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DataStoreHelper.java
index 6ce67663..40f4a65e 100644
--- a/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DataStoreHelper.java
+++ b/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DataStoreHelper.java
@@ -57,13 +57,13 @@ public static String encodeForMongoDB(String s) {
         for (int i = 0; i < chars.length; i++) {
             char c = chars[i];
             if (chars[i] == '.' || chars[i] == '$') {
-                sb.append("\\u" + Integer.toHexString(c));
+                sb.append("/u" + Integer.toHexString(c));
             }
             else {
                 sb.append(chars[i]);
             }
         }
-        return sb.toString().replace("\\", "/");
+        return sb.toString();
     }
 
     public static String encodeForOpenTSDB(String s) {
diff --git a/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DateTimeHelper.java b/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DateTimeHelper.java
index c8b35dd5..fea71ac8 100644
--- a/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DateTimeHelper.java
+++ b/com.creditease.uav.helper/src/main/java/com/creditease/agent/helpers/DateTimeHelper.java
@@ -996,4 +996,13 @@ public static Date getYearAgo(Date date) {
 
         return now.getTime();
     }
+    
+    public static int getWeekday(Date date) {
+        
+        Calendar cal = Calendar.getInstance();
+        
+        cal.setTime(date);
+
+        return cal.get(Calendar.DAY_OF_WEEK) - 1;
+    }
 }
diff --git a/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java b/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
index 6802f694..662ea72e 100644
--- a/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
+++ b/com.creditease.uav.hook.mq/src/main/java/com/creditease/uav/hook/rabbitmq/interceptors/RabbitmqIT.java
@@ -169,7 +169,7 @@ public void preProcess(Channel t, Object proxy, Method method, Object[] args) {
                             new Object[] { (BasicProperties) args[args.length - 2], args[args.length - 1] });
                     if (ivcContextParams != null
                             && ivcContextParams.containsKey(InvokeChainConstants.PARAM_MQHEAD_INFO)) {
-                        args[2] = ivcContextParams.get(InvokeChainConstants.PARAM_MQHEAD_INFO);
+                        args[args.length - 2] = ivcContextParams.get(InvokeChainConstants.PARAM_MQHEAD_INFO);
                     }
                 }
             }
diff --git a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/healthmanager/newlog/HMNewLogIndexMgr.java b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/healthmanager/newlog/HMNewLogIndexMgr.java
index 6d88149d..bbf3e151 100644
--- a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/healthmanager/newlog/HMNewLogIndexMgr.java
+++ b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/healthmanager/newlog/HMNewLogIndexMgr.java
@@ -52,6 +52,7 @@ public class HMNewLogIndexMgr extends AbstractComponent {
     private ESClient client;
 
     public HMNewLogIndexMgr(String cName, String feature) {
+
         super(cName, feature);
 
         client = (ESClient) this.getConfigManager().getComponent(this.feature, "ESClient");
@@ -141,11 +142,16 @@ public String prepareIndex(String appid) {
                 return currentIndex;
             }
 
-            client.creatIndex(currentIndex);
-            Map<String, Object> set = new HashMap<String, Object>();
-            set.put("index.number_of_shards", 2);
-            set.put("index.number_of_replicas", 0);
-            client.updateIndexSetting(currentIndex, set);
+            Map<String, String> set = new HashMap<String, String>();
+            set.put("index.number_of_shards", "2");
+            set.put("index.number_of_replicas", "0");
+
+            try {
+                client.creatIndex(currentIndex, null, set, null);
+            }
+            catch (Exception e) {
+                log.err(this, "create ES Index FAIL: ", e);
+            }
 
             String sappid = formatAppid(appid);
 
@@ -188,8 +194,7 @@ public void prepareIndexType(String appid, String type) {
             // 设置
             Map<String, Object> sfields = new HashMap<>();
 
-            sfields.put("type", "string");
-            sfields.put("index", "not_analyzed");
+            sfields.put("type", "keyword");
 
             mapping.put("ipport", sfields);
 
diff --git a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/InvokeChainIndexMgr.java b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/InvokeChainIndexMgr.java
index 059a4838..9efa18b3 100644
--- a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/InvokeChainIndexMgr.java
+++ b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/InvokeChainIndexMgr.java
@@ -20,7 +20,6 @@
 
 package com.creditease.uav.invokechain;
 
-import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -53,6 +52,7 @@ public class InvokeChainIndexMgr extends AbstractComponent {
     private ESClient client;
 
     public InvokeChainIndexMgr(String cName, String feature) {
+
         super(cName, feature);
 
         client = (ESClient) this.getConfigManager().getComponent(this.feature, "ESClient");
@@ -125,18 +125,9 @@ public String prepareIndex() {
                 return currentIndex;
             }
 
-            client.creatIndex(currentIndex);
-
-            Map<String, Object> set = new HashMap<String, Object>();
-            set.put("index.number_of_shards", 5);
-            set.put("index.number_of_replicas", 0);
-            client.updateIndexSetting(currentIndex, set);
-            /**
-             * 变更别名到当前新的Index
-             */
-            String previousIndex = this.getCurrentIndex(Calendar.getInstance(), -1);
-            client.addIndexAlias(currentIndex, IVC_DB);
-            client.removeIndexAlias(previousIndex, IVC_DB);
+            Map<String, String> set = new HashMap<String, String>();
+            set.put("index.number_of_shards", "5");
+            set.put("index.number_of_replicas", "0");
 
             /**
              * 设置不需要分词的索引字段spanid，parentid，traceid，epinfo(方法级排序使用), appuuid（精确查找应用实例）
@@ -145,8 +136,7 @@ public String prepareIndex() {
 
             Map<String, Object> fields = new HashMap<>();
 
-            fields.put("type", "string");
-            fields.put("index", "not_analyzed");
+            fields.put("type", "keyword");
 
             mapping.put("traceid", fields);
             mapping.put("spanid", fields);
@@ -169,11 +159,18 @@ public String prepareIndex() {
             longType.put("type", "long");
 
             try {
-                client.setIndexTypeMapping(currentIndex, IVC_Table, mapping);
+                client.creatIndex(currentIndex, IVC_Table, set, mapping);
             }
-            catch (IOException e) {
-                log.err(this, "Set ES Index Type Mapping FAIL: ", e);
+            catch (Exception e) {
+                log.err(this, "create ES Index FAIL: ", e);
             }
+
+            /**
+             * 变更别名到当前新的Index
+             */
+            String previousIndex = this.getCurrentIndex(Calendar.getInstance(), -1);
+            client.addIndexAlias(currentIndex, IVC_DB);
+            client.removeIndexAlias(previousIndex, IVC_DB);
         }
 
         return currentIndex;
diff --git a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/SlowOperIndexMgr.java b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/SlowOperIndexMgr.java
index 90c87b32..9833428f 100644
--- a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/SlowOperIndexMgr.java
+++ b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/SlowOperIndexMgr.java
@@ -56,6 +56,7 @@ public class SlowOperIndexMgr extends AbstractComponent {
     }
 
     public SlowOperIndexMgr(String cName, String feature) {
+
         super(cName, feature);
 
         client = (ESClient) this.getConfigManager().getComponent(this.feature, "ESClient");
@@ -145,11 +146,16 @@ public String prepareIndex(String appid) {
                 return currentIndex;
             }
 
-            client.creatIndex(currentIndex);
-            Map<String, Object> set = new HashMap<String, Object>();
-            set.put("index.number_of_shards", 5);
-            set.put("index.number_of_replicas", 0);
-            client.updateIndexSetting(currentIndex, set);
+            Map<String, String> set = new HashMap<String, String>();
+            set.put("index.number_of_shards", "5");
+            set.put("index.number_of_replicas", "0");
+
+            try {
+                client.creatIndex(currentIndex, null, set, null);
+            }
+            catch (Exception e) {
+                log.err(this, "create ES Index FAIL: ", e);
+            }
 
             String sappid = formatAppid(appid);
 
@@ -192,8 +198,7 @@ public void prepareIndexType(String currentIndex, String type) {
             // 设置
             Map<String, Object> sfields = new HashMap<>();
 
-            sfields.put("type", "string");
-            sfields.put("index", "not_analyzed");
+            sfields.put("type", "keyword");
 
             mapping.put("traceid", sfields);
             mapping.put("spanid", sfields);
diff --git a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/collect/InvokeChainDataCollectHandler.java b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/collect/InvokeChainDataCollectHandler.java
index 1003fe03..5c85110b 100644
--- a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/collect/InvokeChainDataCollectHandler.java
+++ b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/collect/InvokeChainDataCollectHandler.java
@@ -65,13 +65,18 @@ public void handle(CollectDataFrame frame) {
 
         for (Line line : frame.getLines()) {
 
-            String content = line.getContent();
-
-            Span span = new Span(content);
-
-            pushLatestIVCDataToCache(appUUID, span);
-
-            pushSpanToBulkRequest(appUUID, frame.getAppgroup(), span, bulkRequest);
+            try {
+                String content = line.getContent();
+                                 
+                  Span span = new Span(content);
+
+                  pushLatestIVCDataToCache(appUUID, span);
+
+                  pushSpanToBulkRequest(appUUID, frame.getAppgroup(), span, bulkRequest);
+              }
+              catch (Exception e) {
+                  this.log.err(this, "unsupported ivc content :" + line.getContent(), e);
+              }
         }
 
         // cm.submitBatch();
diff --git a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/data/Span.java b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/data/Span.java
index 392c6146..315ed6b6 100644
--- a/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/data/Span.java
+++ b/com.creditease.uav.invokechain/src/main/java/com/creditease/uav/invokechain/data/Span.java
@@ -92,7 +92,7 @@ public String toString() {
 
     private String methodName = "";
 
-    private String endpointInfo;
+    private String endpointInfo = "";
 
     private String state = "";
 
@@ -109,11 +109,11 @@ public Span(String ivcLogSpan) {
         this.startTime = DataConvertHelper.toLong(info[4], -1);
         this.cost = DataConvertHelper.toLong(info[5], -1);
         this.appHostPort = info[6];
-        this.appid = info[7];
-        this.endpointInfo = info[8];
+        this.appid = decodeForIVC(info[7]);
+        this.endpointInfo = decodeForIVC(info[8]);
         this.className = info[9];
         this.methodName = info[10];
-        this.url = info[11];
+        this.url = decodeForIVC(info[11]);
         this.state = EncodeHelper.urlDecode(info[12]);
 
     }
@@ -289,5 +289,14 @@ public void setAppHostPort(String appHostPort) {
 
         this.appHostPort = appHostPort;
     }
+    private String decodeForIVC(String s) {
+
+        if (!StringHelper.isEmpty(s) && s.contains("%3b")) {
+            return s.replace("%3b", ";");
+        }
+        else {
+            return s;
+        }
+    }
 
 }
diff --git a/com.creditease.uav.monitorframework.apm/src/main/java/com/creditease/uav/apm/invokechain/span/Span.java b/com.creditease.uav.monitorframework.apm/src/main/java/com/creditease/uav/apm/invokechain/span/Span.java
index 1e0a6528..c9ec7207 100644
--- a/com.creditease.uav.monitorframework.apm/src/main/java/com/creditease/uav/apm/invokechain/span/Span.java
+++ b/com.creditease.uav.monitorframework.apm/src/main/java/com/creditease/uav/apm/invokechain/span/Span.java
@@ -74,7 +74,7 @@ public String toString() {
 
     private String methodName = "";
 
-    private String endpointInfo;
+    private String endpointInfo = "";
 
     private String state = "";
 
@@ -122,7 +122,7 @@ public String getAppid() {
 
     public void setAppid(String appid) {
 
-        this.appid = appid;
+        this.appid = encodeForIVC(appid);
     }
 
     public String getEndpointType() {
@@ -140,7 +140,7 @@ public void setEndpointInfo(String endpointInfo) {
         if (StringHelper.isEmpty(endpointInfo)) {
             return;
         }
-        this.endpointInfo = endpointInfo;
+        this.endpointInfo = encodeForIVC(endpointInfo);
     }
 
     public String getUrl() {
@@ -154,7 +154,7 @@ public void setUrl(String url) {
             return;
         }
 
-        this.url = url;
+        this.url = encodeForIVC(url);
     }
 
     public long getStartTime() {
@@ -279,4 +279,15 @@ public void end() {
         long endTime = System.currentTimeMillis();
         this.cost = endTime - this.startTime;
     }
+
+    private String encodeForIVC(String s) {
+
+        if (!StringHelper.isEmpty(s) && s.contains(";")) {
+            return s.replace(";", "%3b");
+        }
+        else {
+            return s;
+        }
+    }
+
 }
diff --git a/com.creditease.uav.threadanalysis/src/main/java/com/creditease/uav/threadanalysis/server/ThreadAnalysisIndexMgr.java b/com.creditease.uav.threadanalysis/src/main/java/com/creditease/uav/threadanalysis/server/ThreadAnalysisIndexMgr.java
index 9923aa3b..43b37552 100644
--- a/com.creditease.uav.threadanalysis/src/main/java/com/creditease/uav/threadanalysis/server/ThreadAnalysisIndexMgr.java
+++ b/com.creditease.uav.threadanalysis/src/main/java/com/creditease/uav/threadanalysis/server/ThreadAnalysisIndexMgr.java
@@ -20,7 +20,6 @@
 
 package com.creditease.uav.threadanalysis.server;
 
-import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,6 +43,7 @@ public class ThreadAnalysisIndexMgr extends AbstractComponent {
     private ESClient client;
 
     public ThreadAnalysisIndexMgr(String cName, String feature) {
+
         super(cName, feature);
 
         client = (ESClient) this.getConfigManager().getComponent(this.feature, "ESClient");
@@ -116,18 +116,9 @@ public String prepareIndex() {
                 return currentIndex;
             }
 
-            client.creatIndex(currentIndex);
-
-            Map<String, Object> set = new HashMap<String, Object>();
-            set.put("index.number_of_shards", 5);
-            set.put("index.number_of_replicas", 0);
-            client.updateIndexSetting(currentIndex, set);
-            /**
-             * 变更别名到当前新的Index
-             */
-            String previousIndex = this.getCurrentIndex(Calendar.getInstance(), -1);
-            client.addIndexAlias(currentIndex, JTA_DB);
-            client.removeIndexAlias(previousIndex, JTA_DB);
+            Map<String, String> set = new HashMap<String, String>();
+            set.put("index.number_of_shards", "5");
+            set.put("index.number_of_replicas", "0");
 
             /**
              * 就只有pname、info做分词，其他属性不做分词
@@ -135,8 +126,7 @@ public String prepareIndex() {
             Map<String, Map<String, Object>> mapping = new HashMap<String, Map<String, Object>>();
 
             Map<String, Object> stringFields = new HashMap<String, Object>();
-            stringFields.put("type", "string");
-            stringFields.put("index", "not_analyzed");
+            stringFields.put("type", "keyword");
 
             mapping.put("ipport", stringFields);
             mapping.put("pid", stringFields);
@@ -181,11 +171,18 @@ public String prepareIndex() {
             mapping.put("time", timestamp);
 
             try {
-                client.setIndexTypeMapping(currentIndex, JTA_TABLE, mapping);
+                client.creatIndex(currentIndex, JTA_TABLE, set, mapping);
             }
-            catch (IOException e) {
-                log.err(this, "Set ES Index Type Mapping FAIL: ", e);
+            catch (Exception e) {
+                log.err(this, "create ES Index FAIL: ", e);
             }
+
+            /**
+             * 变更别名到当前新的Index
+             */
+            String previousIndex = this.getCurrentIndex(Calendar.getInstance(), -1);
+            client.addIndexAlias(currentIndex, JTA_DB);
+            client.removeIndexAlias(previousIndex, JTA_DB);
         }
 
         return currentIndex;