From b89f1d3745044fec20c9cfe7a94bdb301d2ae645 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 08 五月 2025 17:47:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java | 349 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 212 insertions(+), 137 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
index 9e9b384..cedb457 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
@@ -83,6 +83,8 @@
private QrCodeDeliveryReplyService qrCodeDeliveryReplyService;
@Autowired
private SecurityDetectionService securityDetectionService;
+ @Autowired
+ private MqttPushUtil mqttPushUtil;
/**
* 每天的9点执行的任务
@@ -132,8 +134,6 @@
LocalDate localDate = LocalDate.now().minusDays(1);
String startTime = localDate + " 00:00:00";
String endTime = localDate + " 23:59:59";
- long l = System.currentTimeMillis();
- System.err.println("开始时间："+l);
// 查询所有的mango数据
List<AcquisitionBillingMode> acquisitionBillingModeList = acquisitionBillingModeService.getRangeTimeData(startTime, endTime);
List<BillingModeVerify> billingModeVerifyList = billingModeVerifyService.getRangeTimeData(startTime, endTime);
@@ -163,148 +163,219 @@
List<PlatformRemoteUpdateReply> platformRemoteUpdateReplyList = platformRemoteUpdateReplyService.getRangeTimeData(startTime, endTime);
List<QrCodeDeliveryReply> qrCodeDeliveryReplyList = qrCodeDeliveryReplyService.getRangeTimeData(startTime, endTime);
List<SecurityDetection> securityDetectionList = securityDetectionService.getRangeTimeData(startTime, endTime);
- System.err.println("结束时间："+(System.currentTimeMillis()-l));
customthreadPoolExecutor.execute(() -> {
-// if (acquisitionBillingModeList != null && acquisitionBillingModeList.size() > 0) {
-// for (AcquisitionBillingMode acquisitionBillingMode : acquisitionBillingModeList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", acquisitionBillingMode.getCharging_pile_code()), JSONObject.toJSONString(acquisitionBillingMode));
+ if (acquisitionBillingModeList != null && acquisitionBillingModeList.size() > 0) {
+ for (AcquisitionBillingMode acquisitionBillingMode : acquisitionBillingModeList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", acquisitionBillingMode.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", acquisitionBillingMode.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (billingModeVerifyList != null && billingModeVerifyList.size() > 0) {
+ for (BillingModeVerify billingModeVerify : billingModeVerifyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", billingModeVerify.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", billingModeVerify.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (bmsAbortList != null && bmsAbortList.size() > 0) {
+ for (BmsAbort bmsAbort : bmsAbortList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", bmsAbort.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsAbort.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (bmsDemandAndChargerExportationList != null && bmsDemandAndChargerExportationList.size() > 0) {
+ for (BmsDemandAndChargerExportation bmsDemandAndChargerExportation : bmsDemandAndChargerExportationList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", bmsDemandAndChargerExportation.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsDemandAndChargerExportation.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (onlineList != null && onlineList.size() > 0) {
+ for (Online online : onlineList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", online.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", online.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (endChargeList != null && endChargeList.size() > 0) {
+ for (EndCharge endCharge : endChargeList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", endCharge.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", endCharge.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (errorMessageMessageList != null && errorMessageMessageList.size() > 0) {
+ for (ErrorMessageMessage errorMessageMessage : errorMessageMessageList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", errorMessageMessage.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", errorMessageMessage.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (uploadRealTimeMonitoringDataList != null && uploadRealTimeMonitoringDataList.size() > 0) {
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : uploadRealTimeMonitoringDataList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", uploadRealTimeMonitoringData.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", uploadRealTimeMonitoringData.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (chargingHandshakeList != null && chargingHandshakeList.size() > 0) {
+ for (ChargingHandshake chargingHandshake : chargingHandshakeList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", chargingHandshake.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingHandshake.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (parameterSettingList != null && parameterSettingList.size() > 0) {
+ for (ParameterSetting parameterSetting : parameterSettingList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", parameterSetting.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", parameterSetting.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (motorAbortList != null && motorAbortList.size() > 0) {
+ for (MotorAbort motorAbort : motorAbortList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", motorAbort.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", motorAbort.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (bmsInformationList != null && bmsInformationList.size() > 0) {
+ for (BmsInformation bmsInformation : bmsInformationList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", bmsInformation.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsInformation.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (chargingPileStartsChargingList != null && chargingPileStartsChargingList.size() > 0) {
+ for (ChargingPileStartsCharging chargingPileStartsCharging : chargingPileStartsChargingList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", chargingPileStartsCharging.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileStartsCharging.getCharging_pile_code()),jsonObject.toJSONString());
+ }
+ }
+ if (platformStartChargingReplyList != null && platformStartChargingReplyList.size() > 0) {
+ for (PlatformStartChargingReply platformStartChargingReply : platformStartChargingReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", platformStartChargingReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStartChargingReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (platformStopChargingReplyList != null && platformStopChargingReplyList.size() > 0) {
+ for (PlatformStopChargingReply platformStopChargingReply : platformStopChargingReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", platformStopChargingReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStopChargingReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (transactionRecordList != null && transactionRecordList.size() > 0) {
+ for (TransactionRecord transactionRecord : transactionRecordList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", transactionRecord.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", transactionRecord.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+// if (updateBalanceReplyList != null && updateBalanceReplyList.size() > 0) {
+// for (UpdateBalanceReply updateBalanceReply : updateBalanceReplyList) {
+// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", updateBalanceReply.getCharging_pile_code()), JSONObject.toJSONString(updateBalanceReply));
// }
// }
-// if (billingModeVerifyList != null && billingModeVerifyList.size() > 0) {
-// for (BillingModeVerify billingModeVerify : billingModeVerifyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", billingModeVerify.getCharging_pile_code()), JSONObject.toJSONString(billingModeVerify));
+// if (synchronizeOfflineCardReplyList != null && synchronizeOfflineCardReplyList.size() > 0) {
+// for (SynchronizeOfflineCardReply synchronizeOfflineCardReply : synchronizeOfflineCardReplyList) {
+// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", synchronizeOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(synchronizeOfflineCardReply));
// }
// }
-// if (bmsAbortList != null && bmsAbortList.size() > 0) {
-// for (BmsAbort bmsAbort : bmsAbortList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsAbort.getCharging_pile_code()), JSONObject.toJSONString(bmsAbort));
+// if (clearOfflineCardReplyList != null && clearOfflineCardReplyList.size() > 0) {
+// for (ClearOfflineCardReply clearOfflineCardReply : clearOfflineCardReplyList) {
+// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", clearOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(clearOfflineCardReply));
+// }
+// }
+ if (workingParameterSettingReplyList != null && workingParameterSettingReplyList.size() > 0) {
+ for (WorkingParameterSettingReply workingParameterSettingReply : workingParameterSettingReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", workingParameterSettingReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", workingParameterSettingReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (timingSettingList != null && timingSettingList.size() > 0) {
+ for (TimingSetting timingSetting : timingSettingList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", timingSetting.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", timingSetting.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+// if (setupBillingModelReplyList != null && setupBillingModelReplyList.size() > 0) {
+// for (SetupBillingModelReply setupBillingModelReply : setupBillingModelReplyList) {
+// mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", setupBillingModelReply.getCharging_pile_code()), JSONObject.toJSONString(setupBillingModelReply));
// }
// }
-// if (bmsDemandAndChargerExportationList != null && bmsDemandAndChargerExportationList.size() > 0) {
-// for (BmsDemandAndChargerExportation bmsDemandAndChargerExportation : bmsDemandAndChargerExportationList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsDemandAndChargerExportation.getCharging_pile_code()), JSONObject.toJSONString(bmsDemandAndChargerExportation));
-// }
-// }
-// if (onlineList != null && onlineList.size() > 0) {
-// for (Online online : onlineList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", online.getCharging_pile_code()), JSONObject.toJSONString(online));
-// }
-// }
-// if (endChargeList != null && endChargeList.size() > 0) {
-// for (EndCharge endCharge : endChargeList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", endCharge.getCharging_pile_code()), JSONObject.toJSONString(endCharge));
-// }
-// }
-// if (errorMessageMessageList != null && errorMessageMessageList.size() > 0) {
-// for (ErrorMessageMessage errorMessageMessage : errorMessageMessageList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", errorMessageMessage.getCharging_pile_code()), JSONObject.toJSONString(errorMessageMessage));
-// }
-// }
-// if (uploadRealTimeMonitoringDataList != null && uploadRealTimeMonitoringDataList.size() > 0) {
-// for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : uploadRealTimeMonitoringDataList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", uploadRealTimeMonitoringData.getCharging_pile_code()), JSONObject.toJSONString(uploadRealTimeMonitoringData));
-// }
-// }
-// if (chargingHandshakeList != null && chargingHandshakeList.size() > 0) {
-// for (ChargingHandshake chargingHandshake : chargingHandshakeList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingHandshake.getCharging_pile_code()), JSONObject.toJSONString(chargingHandshake));
-// }
-// }
-// if (parameterSettingList != null && parameterSettingList.size() > 0) {
-// for (ParameterSetting parameterSetting : parameterSettingList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", parameterSetting.getCharging_pile_code()), JSONObject.toJSONString(parameterSetting));
-// }
-// }
-// if (motorAbortList != null && motorAbortList.size() > 0) {
-// for (MotorAbort motorAbort : motorAbortList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", motorAbort.getCharging_pile_code()), JSONObject.toJSONString(motorAbort));
-// }
-// }
-// if (bmsInformationList != null && bmsInformationList.size() > 0) {
-// for (BmsInformation bmsInformation : bmsInformationList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", bmsInformation.getCharging_pile_code()), JSONObject.toJSONString(bmsInformation));
-// }
-// }
-// if (chargingPileStartsChargingList != null && chargingPileStartsChargingList.size() > 0) {
-// for (ChargingPileStartsCharging chargingPileStartsCharging : chargingPileStartsChargingList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileStartsCharging.getCharging_pile_code()),JSONObject.toJSONString(chargingPileStartsCharging));
-// }
-// }
-// if (platformStartChargingReplyList != null && platformStartChargingReplyList.size() > 0) {
-// for (PlatformStartChargingReply platformStartChargingReply : platformStartChargingReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStartChargingReply.getCharging_pile_code()), JSONObject.toJSONString(platformStartChargingReply));
-// }
-// }
-// if (platformStopChargingReplyList != null && platformStopChargingReplyList.size() > 0) {
-// for (PlatformStopChargingReply platformStopChargingReply : platformStopChargingReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformStopChargingReply.getCharging_pile_code()), JSONObject.toJSONString(platformStopChargingReply));
-// }
-// }
-// if (transactionRecordList != null && transactionRecordList.size() > 0) {
-// for (TransactionRecord transactionRecord : transactionRecordList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", transactionRecord.getCharging_pile_code()), JSONObject.toJSONString(transactionRecord));
-// }
-// }
-//// if (updateBalanceReplyList != null && updateBalanceReplyList.size() > 0) {
-//// for (UpdateBalanceReply updateBalanceReply : updateBalanceReplyList) {
-//// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", updateBalanceReply.getCharging_pile_code()), JSONObject.toJSONString(updateBalanceReply));
-//// }
-//// }
-//// if (synchronizeOfflineCardReplyList != null && synchronizeOfflineCardReplyList.size() > 0) {
-//// for (SynchronizeOfflineCardReply synchronizeOfflineCardReply : synchronizeOfflineCardReplyList) {
-//// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", synchronizeOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(synchronizeOfflineCardReply));
-//// }
-//// }
-//// if (clearOfflineCardReplyList != null && clearOfflineCardReplyList.size() > 0) {
-//// for (ClearOfflineCardReply clearOfflineCardReply : clearOfflineCardReplyList) {
-//// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", clearOfflineCardReply.getCharging_pile_code()), JSONObject.toJSONString(clearOfflineCardReply));
-//// }
-//// }
-// if (workingParameterSettingReplyList != null && workingParameterSettingReplyList.size() > 0) {
-// for (WorkingParameterSettingReply workingParameterSettingReply : workingParameterSettingReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", workingParameterSettingReply.getCharging_pile_code()), JSONObject.toJSONString(workingParameterSettingReply));
-// }
-// }
-// if (timingSettingList != null && timingSettingList.size() > 0) {
-// for (TimingSetting timingSetting : timingSettingList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", timingSetting.getCharging_pile_code()), JSONObject.toJSONString(timingSetting));
-// }
-// }
-//// if (setupBillingModelReplyList != null && setupBillingModelReplyList.size() > 0) {
-//// for (SetupBillingModelReply setupBillingModelReply : setupBillingModelReplyList) {
-//// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", setupBillingModelReply.getCharging_pile_code()), JSONObject.toJSONString(setupBillingModelReply));
-//// }
-//// }
-// if (groundLockRealTimeDataList != null && groundLockRealTimeDataList.size() > 0) {
-// for (GroundLockRealTimeData groundLockRealTimeData : groundLockRealTimeDataList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", groundLockRealTimeData.getCharging_pile_code()), JSONObject.toJSONString(groundLockRealTimeData));
-// }
-// }
-// if (chargingPileReturnsGroundLockDataList != null && chargingPileReturnsGroundLockDataList.size() > 0) {
-// for (ChargingPileReturnsGroundLockData chargingPileReturnsGroundLockData : chargingPileReturnsGroundLockDataList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileReturnsGroundLockData.getCharging_pile_code()), JSONObject.toJSONString(chargingPileReturnsGroundLockData));
-// }
-// }
-// if (platformRestartReplyList != null && platformRestartReplyList.size() > 0) {
-// for (PlatformRestartReply platformRestartReply : platformRestartReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRestartReply.getCharging_pile_code()), JSONObject.toJSONString(platformRestartReply));
-// }
-// }
-// if (platformRemoteUpdateReplyList != null && platformRemoteUpdateReplyList.size() > 0) {
-// for (PlatformRemoteUpdateReply platformRemoteUpdateReply : platformRemoteUpdateReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRemoteUpdateReply.getCharging_pile_code()), JSONObject.toJSONString(platformRemoteUpdateReply));
-// }
-// }
-// if (qrCodeDeliveryReplyList != null && qrCodeDeliveryReplyList.size() > 0) {
-// for (QrCodeDeliveryReply qrCodeDeliveryReply : qrCodeDeliveryReplyList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", qrCodeDeliveryReply.getCharging_pile_code()), JSONObject.toJSONString(qrCodeDeliveryReply));
-// }
-// }
-// if (securityDetectionList != null && securityDetectionList.size() > 0) {
-// for (SecurityDetection securityDetection : securityDetectionList) {
-// MqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", securityDetection.getCharging_pile_code()), JSONObject.toJSONString(securityDetection));
-// }
-// }
+ if (groundLockRealTimeDataList != null && groundLockRealTimeDataList.size() > 0) {
+ for (GroundLockRealTimeData groundLockRealTimeData : groundLockRealTimeDataList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", groundLockRealTimeData.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", groundLockRealTimeData.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (chargingPileReturnsGroundLockDataList != null && chargingPileReturnsGroundLockDataList.size() > 0) {
+ for (ChargingPileReturnsGroundLockData chargingPileReturnsGroundLockData : chargingPileReturnsGroundLockDataList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", chargingPileReturnsGroundLockData.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", chargingPileReturnsGroundLockData.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (platformRestartReplyList != null && platformRestartReplyList.size() > 0) {
+ for (PlatformRestartReply platformRestartReply : platformRestartReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", platformRestartReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRestartReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (platformRemoteUpdateReplyList != null && platformRemoteUpdateReplyList.size() > 0) {
+ for (PlatformRemoteUpdateReply platformRemoteUpdateReply : platformRemoteUpdateReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", platformRemoteUpdateReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", platformRemoteUpdateReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (qrCodeDeliveryReplyList != null && qrCodeDeliveryReplyList.size() > 0) {
+ for (QrCodeDeliveryReply qrCodeDeliveryReply : qrCodeDeliveryReplyList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", qrCodeDeliveryReply.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", qrCodeDeliveryReply.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
+ if (securityDetectionList != null && securityDetectionList.size() > 0) {
+ for (SecurityDetection securityDetection : securityDetectionList) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("device_code", securityDetection.getCharging_pile_code());
+ jsonObject.put("report_time", System.currentTimeMillis());
+ mqttPushUtil.pushChargePileData(TopicConstants.CHARGE_PILE_CODE.replace("CHARGE_PILE_CODE", securityDetection.getCharging_pile_code()), jsonObject.toJSONString());
+ }
+ }
});
@@ -346,4 +417,8 @@
}
}
+ public static void main(String[] args) {
+ System.err.println(System.currentTimeMillis());
+ }
+
}
--
Gitblit v1.7.1