|
@@ -61,7 +61,7 @@ public class NettyAlarmServiceImpl extends AlarmRecordMsgHandler {
|
|
|
// "alarm_obj_name": "yy1中文名"
|
|
|
// }
|
|
|
String objId = alarmRecord.getString("objId");
|
|
|
- List<JSONObject> objectList = centerDataService.queryObjListByObjId(alarmRecord.getString("projectId"), Arrays.asList(objId));
|
|
|
+ List<JSONObject> objectList = centerDataService.queryObjListByObjId(alarmUrlParam.getGroupCode(),alarmRecord.getString("projectId"), Arrays.asList(objId));
|
|
|
JSONObject supplement = new JSONObject();
|
|
|
if (!CollectionUtils.isEmpty(objectList)) {
|
|
|
supplement.put("alarm_obj_name", objectList.get(0).get("localName"));
|
|
@@ -105,7 +105,7 @@ public class NettyAlarmServiceImpl extends AlarmRecordMsgHandler {
|
|
|
@SneakyThrows
|
|
|
@Override
|
|
|
protected String getObjClassCode(AlarmUrlParam urlParam, String objId) {
|
|
|
- List<JSONObject> objectList = centerDataService.queryObjListByObjId(urlParam.getProjectId(), Arrays.asList(objId));
|
|
|
+ List<JSONObject> objectList = centerDataService.queryObjListByObjId(urlParam.getGroupCode(),urlParam.getProjectId(), Arrays.asList(objId));
|
|
|
if (!CollectionUtils.isEmpty(objectList)) {
|
|
|
return objectList.get(0).getString("classCode");//设备类型编码
|
|
|
}
|