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