Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master'

wudla 4 anni fa
parent
commit
0c7cdc38af
2 ha cambiato i file con 43 aggiunte e 6 eliminazioni
  1. 37 5
      docs/alarm/alarm_api.md
  2. 6 1
      docs/alarm/alarm_dict.md

+ 37 - 5
docs/alarm/alarm_api.md

@@ -246,6 +246,20 @@
 }
 ```
 
+#### batch_create
+
+一次最多创建200条
+
+```json5
+{
+  "alarmConfigs": [
+    {
+      // 参考create参数
+    }
+  ]
+}
+```
+
 #### update
 
 请求参数
@@ -267,6 +281,19 @@
 }
 ```
 
+#### batch_update
+
+一次最多更新200条
+```json5
+{
+  "alarmConfigs": [
+    {
+      // 参考update参数
+    }
+  ]
+}
+```
+
 #### delete
 
 请求参数
@@ -300,8 +327,8 @@
   "category": '报警分类',
   "concern": 1,
   "nature": "报警性质",
-  "treat_mode": "处理方式",
-  "treat_state": "处理状态",
+  "treatMode": "处理方式",
+  "treatState": "处理状态",
   "state": "报警状态",
   "effectStartTime": 1602953256000 ,
   "effectEndTime": 1602953256000 ,
@@ -382,7 +409,10 @@
   "name": "生活给水水泵 产生报警", // 报警名称,必填
   "category": "Eq", // 报警类型,必填
   "concern": 0,
-  "state": 2,
+  "state": 2, // 报警状态
+  "treatState": 1,  // 报警处理状态
+  "treatMode": 1,  // 报警处理方式
+  "nature": 1, // 报警性质
   "createUser": "system",
   "condition": { // 报警条件
     "end": "onlineStatus<0.5",
@@ -412,6 +442,7 @@
   "updateUser": "system",
   "updateTime": 1605855628000,
   "valid": 1,
+  "supplement": {}  // 补充说明
 }
 ```
 
@@ -438,8 +469,9 @@
   "updateTime": 1605855628000,
   "valid": 1,
   "nature": "报警性质",
-  "treat_mode": "处理方式",
-  "treat_state": "处理状态",
+  "treatMode": "处理方式",
+  "treatState": "处理状态",
+  "supplement": {}  // 补充说明
 }
 ```
 

+ 6 - 1
docs/alarm/alarm_dict.md

@@ -10,8 +10,13 @@ public enum EnumAlarmCategory {
     EQ("Eq", "设备报警"),
     SP("Sp", "空间报警"),
     SY("Sy", "系统报警"),
+    SAFE("Safe", "安全报警"),
     RUN("Run", "高效运行报警"),
-    ENV("Env", "环境报警");
+    ENV("Env", "环境报警"),
+    ENERGY("Energy", "能源报警"),
+    TENANT("Tenant", "租户报警"),
+    ELECTRIC("Electric", "配电报警"),
+    BIM("Bim", "BIM报警");
 
     @Setter
     @Getter