Merge branch 'master' of http://39.106.8.246:3003/persagy/dmp-alarm-starter

src/main/java/com/persagy/dmp/starter/alarm/service/NettyAlarmService.java

@@ -127,7 +127,7 @@ public abstract class NettyAlarmService extends BaseService{
      * @since: 2020/11/30 4:00 下午
      * @version: V1.0
      */
-    public abstract JSONObject getAlarmSupplement(String objId);
+    public abstract JSONObject getAlarmSupplement(String id,String objId);
 
     /**
      * @description: 获取报警等级
@@ -164,6 +164,7 @@ public abstract class NettyAlarmService extends BaseService{
      * @version: V1.0
      */
     public String createAlarm(JSONObject data) throws Exception {
+        String id = data.getString("id");
         //报警分类（设备、空间、系统 Eq，Sp，Sy）
         String category = data.getString("category");
         String objId = data.getString("objId");
@@ -173,7 +174,7 @@ public abstract class NettyAlarmService extends BaseService{
 
         data.put("name", getAlarmName(objId));
         data.put("remark", getAlarmRemark(getAlarmUrlParam(data),objId,itemCode));
-        data.put("supplement", getAlarmSupplement(objId));
+        data.put("supplement", getAlarmSupplement(id,objId));
         data.put("level", getAlarmLevel(data));
 
         DmpResult<JSONObject> alarmRecord = alarmClient.createAlarmRecord(getAlarmUrlParam(data), data);