From a561068a61bd142318913f2e12e58d44542d9c7e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 五月 2025 14:30:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 151 +++++++++++++++++++++++++++++---------------------
1 files changed, 88 insertions(+), 63 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index db9c638..e45fa9b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -15,7 +15,6 @@
import com.ruoyi.integration.iotda.utils.tools.MessageUtil;
import com.ruoyi.integration.iotda.utils.tools.StrategyUtil;
import com.ruoyi.integration.rocket.model.*;
-import com.ruoyi.integration.rocket.produce.ChargingMessageUtil;
import com.ruoyi.integration.rocket.produce.EnhanceProduce;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -49,9 +48,6 @@
@Resource
private AccountingStrategyDetailClient accountingStrategyDetailClient;
- @Resource
- private ChargingMessageUtil chargingMessageUtil;
-
@@ -84,8 +80,9 @@
switch (service_id){
case SendTagConstant.ONLINE:
OnlineMessage onlineMessage = JSON.parseObject(content.toJSONString(),OnlineMessage.class);
- chargingMessage.setOnlineMessage(onlineMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.onlineMessage(onlineMessage);
+// chargingMessage.setOnlineMessage(onlineMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件
// 业务处理 登录认证应答
OnlineReply onlineReply = new OnlineReply();
@@ -102,8 +99,9 @@
break;
case SendTagConstant.PING:
PingMessage pingMessage = JSON.parseObject(content.toJSONString(),PingMessage.class);
- chargingMessage.setPingMessage(pingMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.pingMessage(pingMessage);
+// chargingMessage.setPingMessage(pingMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件
Pong pong = new Pong();
pong.setCharging_pile_code(pingMessage.getCharging_pile_code());
@@ -114,22 +112,25 @@
break;
case SendTagConstant.END_CHARGE:
EndChargeMessage endChargeMessage = JSON.parseObject(content.toJSONString(),EndChargeMessage.class);
- chargingMessage.setEndChargeMessage(endChargeMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.endChargeMessage(endChargeMessage);
+// chargingMessage.setEndChargeMessage(endChargeMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.ERROR_MESSAGE:
ErrorMessageMessage errorMessageMessage = JSON.parseObject(content.toJSONString(),ErrorMessageMessage.class);
- chargingMessage.setErrorMessageMessage(errorMessageMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.errorMessageMessage(errorMessageMessage);
+// chargingMessage.setErrorMessageMessage(errorMessageMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.BILLING_MODE_VERIFY:
BillingModeVerifyMessage billingModeVerifyMessage = JSON.parseObject(content.toJSONString(),BillingModeVerifyMessage.class);
- chargingMessage.setBillingModeVerifyMessage(billingModeVerifyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.billingModeVerifyMessage(billingModeVerifyMessage);
+// chargingMessage.setBillingModeVerifyMessage(billingModeVerifyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件
BillingModeVerifyReply billingModeVerifyReply = new BillingModeVerifyReply();
if(billingModeVerifyMessage.getBilling_model_code().equals("0")){
@@ -157,8 +158,9 @@
break;
case SendTagConstant.ACQUISITION_BILLING_MODE:
AcquisitionBillingModeMessage acquisitionBillingModeMessage = JSON.parseObject(content.toJSONString(),AcquisitionBillingModeMessage.class);
- chargingMessage.setAcquisitionBillingModeMessage(acquisitionBillingModeMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.acquisitionBillingModeMessage(acquisitionBillingModeMessage);
+// chargingMessage.setAcquisitionBillingModeMessage(acquisitionBillingModeMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件 计费模型请求应答 1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段
List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailClient.getDetailListByCode(acquisitionBillingModeMessage.getCharging_pile_code()).getData();
Map<Integer, TAccountingStrategyDetail> strategyPrice = StrategyUtil.getStrategyPrice(accountingStrategyDetails);
@@ -177,55 +179,63 @@
case SendTagConstant.UPLOAD_REAL_TIME_MONITORING_DATA:
log.info("充电实时数据上传");
UploadRealTimeMonitoringDataMessage uploadRealTimeMonitoringDataMessage = JSON.parseObject(content.toJSONString(),UploadRealTimeMonitoringDataMessage.class);
- chargingMessage.setUploadRealTimeMonitoringDataMessage(uploadRealTimeMonitoringDataMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.uploadRealTimeMonitoringDataMessage(uploadRealTimeMonitoringDataMessage);
+// chargingMessage.setUploadRealTimeMonitoringDataMessage(uploadRealTimeMonitoringDataMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.CHARGING_HANDSHAKE:
ChargingHandshakeMessage chargingHandshakeMessage = JSON.parseObject(content.toJSONString(),ChargingHandshakeMessage.class);
- chargingMessage.setChargingHandshakeMessage(chargingHandshakeMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.chargingHandshakeMessage(chargingHandshakeMessage);
+// chargingMessage.setChargingHandshakeMessage(chargingHandshakeMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.PARAMETER_SETTING:
ParameterSettingMessage parameterSettingMessage = JSON.parseObject(content.toJSONString(),ParameterSettingMessage.class);
- chargingMessage.setParameterSettingMessage(parameterSettingMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.parameterSettingMessage(parameterSettingMessage);
+// chargingMessage.setParameterSettingMessage(parameterSettingMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
break;
case SendTagConstant.BMS_ABORT:
BmsAbortMessage bmsAbortMessage = JSON.parseObject(content.toJSONString(),BmsAbortMessage.class);
- chargingMessage.setBmsAbortMessage(bmsAbortMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.bmsAbortMessage(bmsAbortMessage);
+// chargingMessage.setBmsAbortMessage(bmsAbortMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.MOTOR_ABORT:
MotorAbortMessage motorAbortMessage = JSON.parseObject(content.toJSONString(),MotorAbortMessage.class);
- chargingMessage.setMotorAbortMessage(motorAbortMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.motorAbortMessage(motorAbortMessage);
+// chargingMessage.setMotorAbortMessage(motorAbortMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
break;
case SendTagConstant.BMS_DEMAND_AND_CHARGER_EXPORTATION:
BmsDemandAndChargerExportationMessage bmsDemandAndChargerExportationMessage = JSON.parseObject(content.toJSONString(),BmsDemandAndChargerExportationMessage.class);
- chargingMessage.setBmsDemandAndChargerExportationMessage(bmsDemandAndChargerExportationMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.bmsDemandAndChargerExportationMessage(bmsDemandAndChargerExportationMessage);
+// chargingMessage.setBmsDemandAndChargerExportationMessage(bmsDemandAndChargerExportationMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.BMS_INFORMATION:
BmsInformationMessage bmsInformationMessage = JSON.parseObject(content.toJSONString(),BmsInformationMessage.class);
- chargingMessage.setBmsInformationMessage(bmsInformationMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.bmsInformationMessage(bmsInformationMessage);
+// chargingMessage.setBmsInformationMessage(bmsInformationMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.CHARGING_PILE_STARTS_CHARGING:
ChargingPileStartsChargingMessage chargingPileStartsChargingMessage = JSON.parseObject(content.toJSONString(),ChargingPileStartsChargingMessage.class);
- chargingMessage.setChargingPileStartsChargingMessage(chargingPileStartsChargingMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.chargingPileStartsChargingMessage(chargingPileStartsChargingMessage);
+// chargingMessage.setChargingPileStartsChargingMessage(chargingPileStartsChargingMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件
PlatformConfirmationCharging platformConfirmationCharging = new PlatformConfirmationCharging();
platformConfirmationCharging.setCharging_pile_code(chargingPileStartsChargingMessage.getCharging_pile_code());
@@ -239,23 +249,26 @@
break;
case SendTagConstant.PLATFORM_START_CHARGING_REPLY:
PlatformStartChargingReplyMessage platformStartChargingReplyMessage = JSON.parseObject(content.toJSONString(),PlatformStartChargingReplyMessage.class);
- chargingMessage.setPlatformStartChargingReplyMessage(platformStartChargingReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.platformStartChargingReplyMessage(platformStartChargingReplyMessage);
+// chargingMessage.setPlatformStartChargingReplyMessage(platformStartChargingReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.PLATFORM_STOP_CHARGING_REPLY:
PlatformStopChargingReplyMessage platformStopChargingReplyMessage = JSON.parseObject(content.toJSONString(),PlatformStopChargingReplyMessage.class);
- chargingMessage.setPlatformStopChargingReplyMessage(platformStopChargingReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.platformStopChargingReplyMessage(platformStopChargingReplyMessage);
+// chargingMessage.setPlatformStopChargingReplyMessage(platformStopChargingReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.TRANSACTION_RECORD:
TransactionRecordMessage transactionRecordMessage = JSON.parseObject(content.toJSONString(),TransactionRecordMessage.class);
transactionRecordMessage.setResult(content.toJSONString());
- chargingMessage.setTransactionRecordMessage(transactionRecordMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.transactionRecordMessage(transactionRecordMessage);
+// chargingMessage.setTransactionRecordMessage(transactionRecordMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件
ConfirmTransactionRecord confirmTransactionRecord = new ConfirmTransactionRecord();
confirmTransactionRecord.setTransaction_serial_number(transactionRecordMessage.getTransaction_serial_number());
@@ -265,36 +278,41 @@
break;
case SendTagConstant.UPDATE_BALANCE_REPLY:
UpdateBalanceReplyMessage updateBalanceReplyMessage = JSON.parseObject(content.toJSONString(),UpdateBalanceReplyMessage.class);
- chargingMessage.setUpdateBalanceReplyMessage(updateBalanceReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.updateBalanceReplyMessage(updateBalanceReplyMessage);
+// chargingMessage.setUpdateBalanceReplyMessage(updateBalanceReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.SYNCHRONIZE_OFFLINE_CARD_REPLY:
SynchronizeOfflineCardReplyMessage synchronizeOfflineCardReplyMessage = JSON.parseObject(content.toJSONString(),SynchronizeOfflineCardReplyMessage.class);
- chargingMessage.setSynchronizeOfflineCardReplyMessage(synchronizeOfflineCardReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.synchronizeOfflineCardReplyMessage(synchronizeOfflineCardReplyMessage);
+// chargingMessage.setSynchronizeOfflineCardReplyMessage(synchronizeOfflineCardReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.CLEAR_OFFLINE_CARD_REPLY:
ClearOfflineCardReplyMessage clearOfflineCardReplyMessage = JSON.parseObject(content.toJSONString(),ClearOfflineCardReplyMessage.class);
- chargingMessage.setClearOfflineCardReplyMessage(clearOfflineCardReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.clearOfflineCardReplyMessage(clearOfflineCardReplyMessage);
+// chargingMessage.setClearOfflineCardReplyMessage(clearOfflineCardReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.WORKING_PARAMETER_SETTING_REPLY:
WorkingParameterSettingReplyMessage workingParameterSettingReplyMessage = JSON.parseObject(content.toJSONString(),WorkingParameterSettingReplyMessage.class);
- chargingMessage.setWorkingParameterSettingReplyMessage(workingParameterSettingReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.workingParameterSettingReplyMessage(workingParameterSettingReplyMessage);
+// chargingMessage.setWorkingParameterSettingReplyMessage(workingParameterSettingReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.TIMING_SETTING:
TimingSettingMessage timingSettingMessage = JSON.parseObject(content.toJSONString(),TimingSettingMessage.class);
- chargingMessage.setTimingSettingMessage(timingSettingMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.timingSettingMessage(timingSettingMessage);
+// chargingMessage.setTimingSettingMessage(timingSettingMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// 响应硬件 对时设置应答
TimingSettingReply timingSettingReply = new TimingSettingReply();
timingSettingReply.setCharging_pile_code(timingSettingMessage.getCharging_pile_code());
@@ -304,55 +322,62 @@
break;
case SendTagConstant.SETUP_BILLING_MODEL_REPLY:
SetupBillingModelReplyMessage setupBillingModelReplyMessage = JSON.parseObject(content.toJSONString(),SetupBillingModelReplyMessage.class);
- chargingMessage.setSetupBillingModelReplyMessage(setupBillingModelReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.setupBillingModelReplyMessage(setupBillingModelReplyMessage);
+// chargingMessage.setSetupBillingModelReplyMessage(setupBillingModelReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.GROUND_LOCK_REAL_TIME_DATA:
GroundLockRealTimeDataMessage groundLockRealTimeDataMessage = JSON.parseObject(content.toJSONString(),GroundLockRealTimeDataMessage.class);
- chargingMessage.setGroundLockRealTimeDataMessage(groundLockRealTimeDataMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.groundLockRealTimeDataMessage(groundLockRealTimeDataMessage);
+// chargingMessage.setGroundLockRealTimeDataMessage(groundLockRealTimeDataMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.CHARGING_PILE_RETURNS_GROUND_LOCK_DATA:
ChargingPileReturnsGroundLockDataMessage chargingPileReturnsGroundLockDataMessage = JSON.parseObject(content.toJSONString(),ChargingPileReturnsGroundLockDataMessage.class);
- chargingMessage.setChargingPileReturnsGroundLockDataMessage(chargingPileReturnsGroundLockDataMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.chargingPileReturnsGroundLockDataMessage(chargingPileReturnsGroundLockDataMessage);
+// chargingMessage.setChargingPileReturnsGroundLockDataMessage(chargingPileReturnsGroundLockDataMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.PLATFORM_RESTART_REPLY:
PlatformRestartReplyMessage platformRestartReplyMessage = JSON.parseObject(content.toJSONString(),PlatformRestartReplyMessage.class);
- chargingMessage.setPlatformRestartReplyMessage(platformRestartReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.platformRestartReplyMessage(platformRestartReplyMessage);
+// chargingMessage.setPlatformRestartReplyMessage(platformRestartReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.QR_CODE_DELIVERY_REPLY:
QrCodeDeliveryReplyMessage qrCodeDeliveryReplyMessage = JSON.parseObject(content.toJSONString(),QrCodeDeliveryReplyMessage.class);
- chargingMessage.setQrCodeDeliveryReplyMessage(qrCodeDeliveryReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.qrCodeDeliveryReplyMessage(qrCodeDeliveryReplyMessage);
+// chargingMessage.setQrCodeDeliveryReplyMessage(qrCodeDeliveryReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
case SendTagConstant.SECURITY_DETECTION:
SecurityDetectionMessage securityDetectionMessage = JSON.parseObject(content.toJSONString(),SecurityDetectionMessage.class);
- chargingMessage.setSecurityDetectionMessage(securityDetectionMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.securityDetectionMessage(securityDetectionMessage);
+// chargingMessage.setSecurityDetectionMessage(securityDetectionMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
default:
PlatformRemoteUpdateReplyMessage platformRemoteUpdateReplyMessage = JSON.parseObject(content.toJSONString(),PlatformRemoteUpdateReplyMessage.class);
- chargingMessage.setPlatformRemoteUpdateReplyMessage(platformRemoteUpdateReplyMessage);
- chargingMessageUtil.handleMessage(chargingMessage);
+ sendResult = enhanceProduce.platformRemoteUpdateReplyMessage(platformRemoteUpdateReplyMessage);
+// chargingMessage.setPlatformRemoteUpdateReplyMessage(platformRemoteUpdateReplyMessage);
+// chargingMessageUtil.handleMessage(chargingMessage);
// sendResult = enhanceProduce.chargingMessage(chargingMessage);
// 响应硬件
break;
}
-// log.info("rocketmq消息下发结果:{}",sendResult);
+ log.info("rocketmq消息下发结果:{}",sendResult);
return AjaxResult.success();
}
--
Gitblit v1.7.1