增加健康度时间

jjt-biz/src/main/java/com/jjt/hl/vo/ScoreDetailVO.java

@@ -27,6 +27,9 @@ public class ScoreDetailVO {
     @ApiModelProperty("事件时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date time;
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
     @ApiModelProperty("当前值")
     private Float value;
 

jjt-biz/src/main/java/com/jjt/push/service/impl/PushConfigServiceImpl.java

@@ -121,13 +121,13 @@ public class PushConfigServiceImpl implements IPushConfigService {
     public void push(AlarmRecord record) {
         //获取短信接口发送地址
         PushConfig pc = pushConfigMapper.selectPushConfigByPcId(1L);
-        String title = record.getObjName() + "-" + record.getMetricsName() + "超过阈值" + record.getRemark() + "，当前状态：" + record.getAlarmValue();
+        String title = record.getObjName() + "-" + record.getMetricsName() + "超过阈值" + record.getRemark() + "，当前值：" + record.getAlarmValue();
         String content = "";
         String phones = "";
         String mails = "";
         content += "告警指标：" + record.getMetricsName() + "\n";
         content += "告警对象：" + record.getObjName() + "\n";
-        content += "告警内容： 指标值达到告警条件" + record.getRemark() + "\n";
+        content += "告警内容： 指标值达到告警条件 " + record.getRemark() + "\n";
         content += "告警时间：" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, record.getAlarmTime()) + "\n";
         switch (record.getAlarmLevel()) {
             case "low":
@@ -164,11 +164,11 @@ public class PushConfigServiceImpl implements IPushConfigService {
                         PushRecord pr = new PushRecord();
                         pr.setPushType("sms");
                         pr.setAlarmLevel(record.getAlarmLevel());
-                        pr.setSendTitle(title);
+//                        pr.setSendTitle(title);
                         pr.setSendContent(content);
                         pr.setSendObj(p);
                         try {
-                            smsService.send(uri, p, title);
+                            smsService.send(uri, p, content);
                             pr.setSendSuccess("Y");
                         } catch (Exception e) {
                             pr.setSendSuccess("N");

jjt-biz/src/main/resources/mapper/hl/HlMetricsScoreDetailMapper.xml

@@ -34,7 +34,7 @@
         where SCORE_DETAIL_ID = #{scoreDetailId}
     </select>
     <select id="detailList" resultType="com.jjt.hl.vo.ScoreDetailVO">
-        SELECT b.obj_name, c.METRICS_NAME,a.start_time TIME,a.event_value value,c.EVENT
+        SELECT b.obj_name, c.METRICS_NAME,a.start_time TIME,a.END_TIME END_TIME,a.event_value value,c.EVENT
         FROM (SELECT a.*, b.SCORE_DETAIL_ID, b.SCORE_METRICS_ID
             FROM hl_event a,
             hl_metrics_score_detail b