|
@@ -318,7 +318,10 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
endTime = com.persagy.apm.diagnose.utils.DateUtils.str2Date(dateListEntry.getKey(), com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
|
|
endTime = com.persagy.apm.diagnose.utils.DateUtils.str2Date(dateListEntry.getKey(), com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
|
|
}
|
|
}
|
|
JSONArray sendArray = CollectDataUtil.batchBuildSendJsonParam(sendTimeKeyAndDataList,alarmItemCode);
|
|
JSONArray sendArray = CollectDataUtil.batchBuildSendJsonParam(sendTimeKeyAndDataList,alarmItemCode);
|
|
- msgProducer.sendMaintenanceMsg(sendArray);
|
|
|
|
|
|
+ msgProducer.sendIndicatorMsg(sendArray);
|
|
|
|
+ //加锁
|
|
|
|
+ long time1 = System.currentTimeMillis() + (20 * 1000);
|
|
|
|
+ lockUtil.lock(projectId +objIdAndAlarmItemCode+ "_sendMaintenance", String.valueOf(time1));
|
|
// String sentValue = CollectDataUtil.batchBuildSendParam(sendTimeKeyAndDataList,alarmItemCode);
|
|
// String sentValue = CollectDataUtil.batchBuildSendParam(sendTimeKeyAndDataList,alarmItemCode);
|
|
// AlarmWebSocketServer.sendMsgToClients(projectId, sentValue);
|
|
// AlarmWebSocketServer.sendMsgToClients(projectId, sentValue);
|
|
log.info("设备维保发送数据服务数据:" + projectId+";"+ sendArray);
|
|
log.info("设备维保发送数据服务数据:" + projectId+";"+ sendArray);
|