Browse Source

Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0

xujiaheng 3 years ago
parent
commit
25bdd5e7ac

+ 4 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/model/vo/AlarmRecordListItem.java

@@ -39,4 +39,8 @@ public class AlarmRecordListItem {
     private SimpleObjVO alarmTreatState;
     @ApiModelProperty(value = "报警处理方式")
     private SimpleObjVO alarmTreatMode;
+    @ApiModelProperty(value = "忽略报警时间")
+    private Date ignoreTime;
+    @ApiModelProperty(value = "报警处理完成时间")
+    private Date treatEndTime;
 }

+ 3 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/service/AlarmRecordWrapper.java

@@ -189,6 +189,9 @@ public class AlarmRecordWrapper {
             ));
         }
 
+        alarmRecordListItem.setIgnoreTime(alarmRecordItem.getIgnoreTime());
+        alarmRecordListItem.setTreatEndTime(alarmRecordItem.getTreatEndTime());
+
         return alarmRecordListItem;
     }
 

+ 1 - 2
src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
     9977
 spring:
   application:
-    name: energy_alarm_service
+    name: energy-alarm-service
   datasource:
     dynamic:
       enabled: true
@@ -19,7 +19,6 @@ spring:
           separator: ";"
           schema: classpath*:db/init/table.sql
           data: classpath*:db/init/data.sql
-
   data:
     elasticsearch:
       repositories: