Quellcode durchsuchen

Merge branch 'v2.0.0' of http://39.106.8.246:3003/apm/energy-alarm-service into v2.0.0

lixing vor 3 Jahren
Ursprung
Commit
64420cfde3

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

@@ -52,6 +52,8 @@ public class AlarmRecordItemVO {
     private Date treatEndTime;
     @ApiModelProperty(value = "报警描述")
     private String remark;
+    @ApiModelProperty(value = "报警系统")
+    private String category;
     @ApiModelProperty(value = "补充说明")
     private JSONObject supplement;
 }

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

@@ -46,6 +46,8 @@ public class AlarmRecordListItem {
     private Date treatEndTime;
     @ApiModelProperty(value = "报警描述")
     private String remark;
+    @ApiModelProperty(value = "报警系统")
+    private String category;
     @ApiModelProperty(value = "补充说明")
     private JSONObject supplement;
 }

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

@@ -198,6 +198,7 @@ public class AlarmRecordWrapper {
         alarmRecordListItem.setRemark(alarmRecordItem.getRemark());
         //补充说明
         alarmRecordListItem.setSupplement(alarmRecordItem.getSupplement());
+        alarmRecordListItem.setCategory(alarmRecordItem.getCategory());
         return alarmRecordListItem;
     }
 
@@ -266,6 +267,7 @@ public class AlarmRecordWrapper {
         alarmRecordItemVO.setIgnoreTime(alarmRecordItem.getIgnoreTime());
         alarmRecordItemVO.setRemark(alarmRecordItem.getRemark());
         alarmRecordItemVO.setSupplement(alarmRecordItem.getSupplement());
+        alarmRecordItemVO.setCategory(alarmRecordItem.getCategory());
 
         return alarmRecordItemVO;
     }