|
@@ -355,7 +355,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
|
|
|
int indexOf = objIdAndAlarmItemCode.indexOf("_");
|
|
|
String objId = objIdAndAlarmItemCode.substring(0, indexOf);
|
|
|
-
|
|
|
+ String alarmItemCode = objIdAndAlarmItemCode.substring(indexOf + 1);
|
|
|
|
|
|
List<String> infCodeList = entry.getValue();
|
|
|
|
|
@@ -382,8 +382,8 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
if (CollectionUtils.isEmpty(value) || value.size() != infCodeList.size()) {
|
|
|
continue;
|
|
|
}
|
|
|
- String sentValue = CollectDataUtil.buildSendParam(value);
|
|
|
- AlarmWebSocketServer.sendMsgToClients(projectDTO.getProjectId(), CollectDataUtil.buildSendParam(value));
|
|
|
+ String sentValue = CollectDataUtil.buildSendParam(value,alarmItemCode);
|
|
|
+ AlarmWebSocketServer.sendMsgToClients(projectDTO.getProjectId(), CollectDataUtil.buildSendParam(value,alarmItemCode));
|
|
|
log.info("指标发送报表服务数据:" + projectDTO.getProjectId()+";"+ sentValue);
|
|
|
endTime = DateUtils.str2Date(dateListEntry.getKey(), DateUtils.SDF_SECOND);
|
|
|
}
|