指标增加事件，告警增加告警结束时间

jjt-biz/src/main/java/com/jjt/biz/domain/AlarmRecord.java

@@ -76,4 +76,11 @@ public class AlarmRecord extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmTime;
+
+    @ApiModelProperty("告警结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @ApiModelProperty("告警状态 1.正在告警 0.告警结束")
+    private String alarmStatus;
 }

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsTplDetail.java

@@ -17,42 +17,26 @@ import lombok.Data;
 @Data
 public class MetricsTplDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
-    /**
-     * 明细ID
-     */
     @ApiModelProperty("明细ID")
     @TableId
     private Long tplDetailId;
-
-    /**
-     * 模板ID
-     */
     @ApiModelProperty("模板ID")
     @Excel(name = "模板ID")
     private Long tplId;
-
-    /**
-     * 指标ID
-     */
     @ApiModelProperty("指标ID")
     @Excel(name = "指标ID")
     private Long metricsId;
-
-    /**
-     * 指标编码
-     */
     @ApiModelProperty("指标编码")
     @Excel(name = "指标编码")
     private String metricsCode;
-
     @ApiModelProperty("告警-低")
     private String alarmLow;
     @ApiModelProperty("告警-中")
     private String alarmMid;
     @ApiModelProperty("告警-高")
     private String alarmHigh;
-
     @ApiModelProperty("指标定义")
     private MetricsDef metricsDef;
+    @ApiModelProperty("健康度事件")
+    private String event;
 }

jjt-biz/src/main/resources/mapper/alarm/AlarmRecordMapper.xml

@@ -12,6 +12,8 @@
         <result property="alarmLevel" column="ALARM_LEVEL"/>
         <result property="alarmValue" column="ALARM_VALUE"/>
         <result property="alarmTime" column="ALARM_TIME"/>
+        <result property="endTime" column="END_TIME"/>
+        <result property="alarmStatus" column="ALARM_STATUS"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -47,6 +49,8 @@
                      A.ALARM_LEVEL,
                      A.ALARM_VALUE,
                      A.ALARM_TIME,
+                     A.END_TIME,
+                     A.ALARM_STATUS,
                      A.CREATE_BY,
                      A.CREATE_TIME,
                      A.UPDATE_BY,
@@ -92,6 +96,9 @@
             <if test="alarmValue != null  and alarmValue != ''">
                 and ALARM_VALUE = #{alarmValue}
             </if>
+            <if test="alarmStatus != null  and alarmStatus != ''">
+                and ALARM_Status = #{alarmStatus}
+            </if>
             <if test="params.beginAlarmTime != null and params.beginAlarmTime != '' and params.endAlarmTime != null and params.endAlarmTime != ''">
                 and ALARM_TIME between #{params.beginAlarmTime} and #{params.endAlarmTime}
             </if>
@@ -126,6 +133,10 @@
             </if>
             <if test="alarmTime != null">ALARM_TIME,
             </if>
+            <if test="endTime != null">END_TIME,
+            </if>
+            <if test="alarmStatus != null">ALARM_STATUS,
+            </if>
             <if test="createBy != null">CREATE_BY,
             </if>
             <if test="createTime != null">CREATE_TIME,
@@ -150,6 +161,10 @@
             </if>
             <if test="alarmTime != null">#{alarmTime},
             </if>
+            <if test="endTime != null">#{endTime},
+            </if>
+            <if test="alarmStatus != null">#{alarmStatus},
+            </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -184,6 +199,10 @@
             <if test="alarmTime != null">ALARM_TIME =
                 #{alarmTime},
             </if>
+            <if test="endTime != null">END_TIME=#{endTime},
+            </if>
+            <if test="alarmStatus != null">ALARM_STATUS=#{alarmStatus},
+            </if>
             <if test="createBy != null">CREATE_BY =
                 #{createBy},
             </if>

jjt-biz/src/main/resources/mapper/metrics/MetricsTplDetailMapper.xml

@@ -12,6 +12,7 @@
         <result property="alarmLow" column="ALARM_LOW"/>
         <result property="alarmMid" column="ALARM_MID"/>
         <result property="alarmHigh" column="ALARM_HIGH"/>
+        <result property="event" column="EVENT"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -38,6 +39,7 @@
                      a.ALARM_LOW,
                      a.ALARM_MID,
                      a.ALARM_HIGH,
+                     a.EVENT,
                      a.CREATE_BY,
                      a.CREATE_TIME,
                      a.UPDATE_BY,
@@ -98,6 +100,8 @@
             </if>
             <if test="alarmHigh != null">ALARM_HIGH,
             </if>
+            <if test="event != null">EVENT,
+            </if>
             <if test="createBy != null">CREATE_BY,
             </if>
             <if test="createTime != null">CREATE_TIME,
@@ -122,6 +126,8 @@
             </if>
             <if test="alarmHigh != null">#{alarmHigh},
             </if>
+            <if test="event != null">#{event},
+            </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -164,6 +170,9 @@
             <if test="alarmHigh != null">ALARM_HIGH =
                 #{alarmHigh},
             </if>
+            <if test="event != null">EVENT =
+                #{event},
+            </if>
             <if test="createBy != null">CREATE_BY =
                 #{createBy},
             </if>