Browse Source

获取补充说明方法更新

lixing 3 years ago
parent
commit
6a6ef87c60

+ 1 - 1
pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.persagy.dmp.starter</groupId>
     <artifactId>dmp-alarm-starter</artifactId>
 <!--    <version>4.0.0-SNAPSHOT</version>-->
-    <version>4.1.0</version>
+    <version>4.1.5</version>
     <name>dmp-alarm-starter</name>
     <description>dmp_alarm_starter</description>
 

+ 2 - 1
src/main/java/com/persagy/dmp/starter/alarm/feign/client/AlarmClient.java

@@ -3,9 +3,9 @@ package com.persagy.dmp.starter.alarm.feign.client;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.dmp.starter.alarm.constant.RequestUrlConstant;
-import com.persagy.dmp.starter.alarm.feign.fallback.AlarmClientFallbackFactory;
 import com.persagy.dmp.starter.alarm.feign.AlarmUrlParam;
 import com.persagy.dmp.starter.alarm.feign.DmpResult;
+import com.persagy.dmp.starter.alarm.feign.fallback.AlarmClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -60,6 +60,7 @@ public interface AlarmClient {
      * @version: V1.0
      */
     @PostMapping(RequestUrlConstant.ALARM_CONFIG_BATCH_CREATE)
+//    @Headers({"acceptEncoding: gzip","contentType: application/json"})
     DmpResult<JSONObject> batchCreateAlarmConfig(@SpringQueryMap AlarmUrlParam alarmUrlParam, @RequestBody JSONObject jsonObject) throws Exception;
 
     /**

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

@@ -128,7 +128,7 @@ public abstract class NettyAlarmService extends BaseService {
      * @since: 2020/11/30 4:00 下午
      * @version: V1.0
      */
-    public abstract JSONObject getAlarmSupplement(AlarmUrlParam alarmUrlParam, String objId);
+    public abstract JSONObject getAlarmSupplement(AlarmUrlParam alarmUrlParam, JSONObject alarmRecord);
 
     /**
      * @description: 获取报警等级
@@ -181,7 +181,7 @@ public abstract class NettyAlarmService extends BaseService {
 
         data.put("name", getAlarmName(projectId,objId,category));
         data.put("remark", getAlarmRemark(getAlarmUrlParam(data), objId, itemCode));
-        data.put("supplement", getAlarmSupplement(getAlarmUrlParam(data), objId));
+        data.put("supplement", getAlarmSupplement(getAlarmUrlParam(data), data));
         data.put("level", getAlarmLevel(data));
 
         DmpResult<JSONObject> alarmRecord = alarmClient.createAlarmRecord(getAlarmUrlParam(data), data);