Authored by qinchao

告警支持只是发生钉钉

@@ -136,4 +136,10 @@ public class TaskModel { @@ -136,4 +136,10 @@ public class TaskModel {
136 */ 136 */
137 private int dataIntervalTimes; 137 private int dataIntervalTimes;
138 138
  139 + /**
  140 + * 告警途径: 默认 0 :短信+钉钉
  141 + * 1 只有钉钉
  142 + */
  143 + private String alarmChannel;
  144 +
139 } 145 }
@@ -225,6 +225,18 @@ @@ -225,6 +225,18 @@
225 placeholder="告警方式" size="40"/>--%> 225 placeholder="告警方式" size="40"/>--%>
226 </div> 226 </div>
227 </div> 227 </div>
  228 +
  229 + <div class="form-group">
  230 + <label class="col-sm-2 control-label"> <span style="color:red">*</span>告警渠道:</label>
  231 +
  232 + <div class="col-sm-8">
  233 + <select class="form-control" name="alarmChannel" style="width:300px">
  234 + <option value="0"> 短信+钉钉</option>
  235 + <option value="1"> 钉钉</option>>
  236 + </select>
  237 + </div>
  238 + </div>
  239 +
228 <div class="form-group"> 240 <div class="form-group">
229 <label class="col-sm-2 control-label"> <span style="color:red">*</span>数量阀值:</label> 241 <label class="col-sm-2 control-label"> <span style="color:red">*</span>数量阀值:</label>
230 242
@@ -402,6 +414,7 @@ @@ -402,6 +414,7 @@
402 $("select[name='alarmType']").val(3); 414 $("select[name='alarmType']").val(3);
403 $("input[name='alarmNumFlag']").val(""); 415 $("input[name='alarmNumFlag']").val("");
404 $("select[name='isOn']").val(1); 416 $("select[name='isOn']").val(1);
  417 + $("select[name='alarmChannel']").val("0");
405 $("#description").val(""); 418 $("#description").val("");
406 $("#myModalLabel").text("新增任务"); 419 $("#myModalLabel").text("新增任务");
407 } else { 420 } else {
@@ -432,6 +445,7 @@ @@ -432,6 +445,7 @@
432 $("select[name='alarmType']").val(taskModel.alarmType); 445 $("select[name='alarmType']").val(taskModel.alarmType);
433 $("input[name='alarmNumFlag']").val(taskModel.alarmNumFlag); 446 $("input[name='alarmNumFlag']").val(taskModel.alarmNumFlag);
434 $("select[name='isOn']").val(taskModel.isOn); 447 $("select[name='isOn']").val(taskModel.isOn);
  448 + $("select[name='alarmChannel']").val(taskModel.alarmChannel);
435 $("#description").val(taskModel.description); 449 $("#description").val(taskModel.description);
436 450
437 //$("#groupName").find("option[value='"+taskModel.alarmGroupId+"']").attr("selected",true); 451 //$("#groupName").find("option[value='"+taskModel.alarmGroupId+"']").attr("selected",true);
@@ -500,6 +514,7 @@ @@ -500,6 +514,7 @@
500 var alarmType = $("select[name='alarmType']").val(); 514 var alarmType = $("select[name='alarmType']").val();
501 var alarmNumFlag = $("input[name='alarmNumFlag']").val(); 515 var alarmNumFlag = $("input[name='alarmNumFlag']").val();
502 var isOn = $("select[name='isOn']").val(); 516 var isOn = $("select[name='isOn']").val();
  517 + var alarmChannel = $("select[name='alarmChannel']").val();
503 var description = $("#description").val(); 518 var description = $("#description").val();
504 var alarmGroupId = $("#groupName").val(); 519 var alarmGroupId = $("#groupName").val();
505 if (fields == null || fields == "") { 520 if (fields == null || fields == "") {
@@ -603,6 +618,7 @@ @@ -603,6 +618,7 @@
603 alarmType: alarmType, 618 alarmType: alarmType,
604 alarmNumFlag: alarmNumFlag, 619 alarmNumFlag: alarmNumFlag,
605 isOn: isOn, 620 isOn: isOn,
  621 + alarmChannel:alarmChannel,
606 description:description, 622 description:description,
607 alarmGroupId:alarmGroupId, 623 alarmGroupId:alarmGroupId,
608 addSource:0 624 addSource:0