Selaa lähdekoodia

报警列表,详情接口 返回字段添加 补充说明和remark字段

miaolijing 3 vuotta sitten
vanhempi
commit
b9ff713da1

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

@@ -1,5 +1,6 @@
 package com.persagy.apm.alarmservice.group.alarmrecord.model.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.persagy.apm.alarmservice.project.alarmcondition.model.vo.AlarmConditionStrItem;
 import com.persagy.apm.common.model.vo.SimpleObjVO;
@@ -49,4 +50,8 @@ public class AlarmRecordItemVO {
     private Date ignoreTime;
     @ApiModelProperty(value = "报警处理完成时间")
     private Date treatEndTime;
+    @ApiModelProperty(value = "报警描述")
+    private String remark;
+    @ApiModelProperty(value = "补充说明")
+    private JSONObject supplement;
 }

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

@@ -1,5 +1,6 @@
 package com.persagy.apm.alarmservice.group.alarmrecord.model.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.persagy.apm.common.model.vo.SimpleObjVO;
 import io.swagger.annotations.ApiModel;
@@ -43,4 +44,8 @@ public class AlarmRecordListItem {
     private Date ignoreTime;
     @ApiModelProperty(value = "报警处理完成时间")
     private Date treatEndTime;
+    @ApiModelProperty(value = "报警描述")
+    private String remark;
+    @ApiModelProperty(value = "补充说明")
+    private JSONObject supplement;
 }

+ 6 - 1
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/service/AlarmRecordWrapper.java

@@ -194,7 +194,10 @@ public class AlarmRecordWrapper {
 
         alarmRecordListItem.setIgnoreTime(alarmRecordItem.getIgnoreTime());
         alarmRecordListItem.setTreatEndTime(alarmRecordItem.getTreatEndTime());
-
+        //报警描述
+        alarmRecordListItem.setRemark(alarmRecordItem.getRemark());
+        //补充说明
+        alarmRecordListItem.setSupplement(alarmRecordItem.getSupplement());
         return alarmRecordListItem;
     }
 
@@ -262,6 +265,8 @@ public class AlarmRecordWrapper {
 
         alarmRecordItemVO.setTreatEndTime(alarmRecordItem.getTreatEndTime());
         alarmRecordItemVO.setIgnoreTime(alarmRecordItem.getIgnoreTime());
+        alarmRecordItemVO.setRemark(alarmRecordItem.getRemark());
+        alarmRecordItemVO.setSupplement(alarmRecordItem.getSupplement());
 
         return alarmRecordItemVO;
     }

+ 0 - 56
src/main/resources/json/GroupTree.json

@@ -1,56 +0,0 @@
-[
-  {
-    "id": "1",
-    "name": "组合式空调机组",
-    "classCode": "ACATAH",
-    "condition": "installType: 1",
-    "children": []
-  },
-  {
-    "id": "2",
-    "name": "吊装空调",
-    "classCode": "ACATAH",
-    "condition": "installType: 2",
-    "children": []
-  },
-  {
-    "id": "3",
-    "name": "新风机组",
-    "classCode": "ACATFU",
-    "condition": "",
-    "children": []
-  },
-  {
-    "id": "1",
-    "name": "离心式冷水机组",
-    "classCode": "ACCCCC",
-    "children": []
-  },
-  {
-    "id": "2",
-    "name": "螺杆式冷水机组",
-    "classCode": "ACCCSC",
-    "children": []
-  },
-  {
-    "id": "3",
-    "name": "活塞式冷水机组",
-    "classCode": "ACCCPC",
-    "condition": "",
-    "children": []
-  },
-  {
-    "id": "4",
-    "name": "吸收式冷水机组",
-    "classCode": "ACCCAC",
-    "condition": "",
-    "children": []
-  },
-  {
-    "id": "5",
-    "name": "冷却塔",
-    "classCode": "ACCCOT",
-    "condition": "",
-    "children": []
-  }
-]