From ff265ba53df1d9e89ae2d4258007cd2e02811f8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 18:16:06 +0800
Subject: [PATCH] Merge branch 'master' 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/tools/ChargingMessageUtil.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/ChargingMessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/ChargingMessageUtil.java
index e8f5fe4..159a1f0 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/ChargingMessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/ChargingMessageUtil.java
@@ -151,17 +151,17 @@
ErrorMessageMessage errorMessageMessage1 = message.getErrorMessageMessage();
log.info("错误报文-业务消息处理:{}",errorMessageMessage1);
// 持久化消息
- ErrorMessageMessage errorMessageMessage = new ErrorMessageMessage();
- BeanUtils.copyProperties(errorMessageMessage1,errorMessageMessage);
- errorMessageMessageService.create(errorMessageMessage);
+// ErrorMessageMessage errorMessageMessage = new ErrorMessageMessage();
+// BeanUtils.copyProperties(errorMessageMessage1,errorMessageMessage);
+// errorMessageMessageService.create(errorMessageMessage);
break;
case SendTagConstant.BILLING_MODE_VERIFY:
BillingModeVerifyMessage billingModeVerifyMessage = message.getBillingModeVerifyMessage();
log.info("计费模型验证请求-业务消息处理:{}",billingModeVerifyMessage);
// 持久化消息
- BillingModeVerify billingModeVerify = new BillingModeVerify();
- BeanUtils.copyProperties(billingModeVerifyMessage,billingModeVerify);
- billingModeVerifyService.create(billingModeVerify);
+// BillingModeVerify billingModeVerify = new BillingModeVerify();
+// BeanUtils.copyProperties(billingModeVerifyMessage,billingModeVerify);
+// billingModeVerifyService.create(billingModeVerify);
break;
case SendTagConstant.ACQUISITION_BILLING_MODE:
AcquisitionBillingModeMessage acquisitionBillingModeMessage = message.getAcquisitionBillingModeMessage();
@@ -172,7 +172,17 @@
acquisitionBillingModeService.create(acquisitionBillingMode);
break;
case SendTagConstant.UPLOAD_REAL_TIME_MONITORING_DATA:
+ //限制数据处理频率，60秒一次
UploadRealTimeMonitoringDataMessage uploadRealTimeMonitoringDataMessage = message.getUploadRealTimeMonitoringDataMessage();
+ String transaction_serial_number = uploadRealTimeMonitoringDataMessage.getTransaction_serial_number();
+ Object o = redisTemplate.opsForValue().get("upload_real_time_monitoring_data:" + transaction_serial_number);
+ if(null != o){
+ Long m = System.currentTimeMillis() - (Long) o;
+ if(m < 60000){
+ break;
+ }
+ }
+ redisTemplate.opsForValue().set("upload_real_time_monitoring_data:" + transaction_serial_number, System.currentTimeMillis(), 1, TimeUnit.MINUTES);
try {
log.info("上传实时监测数据-业务消息处理:{}",uploadRealTimeMonitoringDataMessage);
// 持久化消息
@@ -225,9 +235,9 @@
ParameterSettingMessage parameterSettingMessage = message.getParameterSettingMessage();
log.info("参数配置-业务消息处理:{}",parameterSettingMessage);
// 持久化消息
- ParameterSetting parameterSetting = new ParameterSetting();
- BeanUtils.copyProperties(parameterSettingMessage,parameterSetting);
- parameterSettingService.create(parameterSetting);
+// ParameterSetting parameterSetting = new ParameterSetting();
+// BeanUtils.copyProperties(parameterSettingMessage,parameterSetting);
+// parameterSettingService.create(parameterSetting);
break;
case SendTagConstant.BMS_ABORT:
BmsAbortMessage bmsAbortMessage = message.getBmsAbortMessage();
@@ -252,6 +262,16 @@
case SendTagConstant.BMS_DEMAND_AND_CHARGER_EXPORTATION:
BmsDemandAndChargerExportationMessage bmsDemandAndChargerExportationMessage = message.getBmsDemandAndChargerExportationMessage();
log.info("充电过程BMS需求、充电机输出-业务消息处理:{}",bmsDemandAndChargerExportationMessage);
+ String transaction_serial_number1 = bmsDemandAndChargerExportationMessage.getTransaction_serial_number();
+ Object o1 = redisTemplate.opsForValue().get("bms_demand_and_charger_exportation:" + transaction_serial_number1);
+ if(null != o1){
+ Long m = System.currentTimeMillis() - (Long) o1;
+ if(m < 60000){
+ break;
+ }
+ }
+ redisTemplate.opsForValue().set("bms_demand_and_charger_exportation:" + transaction_serial_number1, System.currentTimeMillis(), 1, TimeUnit.MINUTES);
+
// 持久化消息
BmsDemandAndChargerExportation bmsDemandAndChargerExportation = new BmsDemandAndChargerExportation();
BeanUtils.copyProperties(bmsDemandAndChargerExportationMessage,bmsDemandAndChargerExportation);
@@ -267,6 +287,16 @@
case SendTagConstant.BMS_INFORMATION:
BmsInformationMessage bmsInformationMessage = message.getBmsInformationMessage();
log.info("充电过程BMS信息-业务消息处理:{}",bmsInformationMessage);
+ String transaction_serial_number2 = bmsInformationMessage.getTransaction_serial_number();
+ Object o2 = redisTemplate.opsForValue().get("bms_information:" + transaction_serial_number2);
+ if(null != o2){
+ Long m = System.currentTimeMillis() - (Long) o2;
+ if(m < 60000){
+ break;
+ }
+ }
+ redisTemplate.opsForValue().set("bms_information:" + transaction_serial_number2, System.currentTimeMillis(), 1, TimeUnit.MINUTES);
+
// 持久化消息
BmsInformation bmsInformation = new BmsInformation();
BeanUtils.copyProperties(bmsInformationMessage,bmsInformation);
@@ -372,9 +402,9 @@
TimingSettingMessage timingSettingMessage = message.getTimingSettingMessage();
log.info("对时设置-业务消息处理:{}",timingSettingMessage);
// 持久化消息
- TimingSetting timingSetting = new TimingSetting();
- BeanUtils.copyProperties(timingSettingMessage,timingSetting);
- timingSettingService.create(timingSetting);
+// TimingSetting timingSetting = new TimingSetting();
+// BeanUtils.copyProperties(timingSettingMessage,timingSetting);
+// timingSettingService.create(timingSetting);
break;
case SendTagConstant.SETUP_BILLING_MODEL_REPLY:
SetupBillingModelReplyMessage setupBillingModelReplyMessage = message.getSetupBillingModelReplyMessage();
@@ -425,14 +455,6 @@
SecurityDetectionVO securityDetection1 = new SecurityDetectionVO();
BeanUtils.copyProperties(securityDetection, securityDetection1);
chargingOrderClient.securityDetection(securityDetection1);
- break;
- default:
- PlatformRemoteUpdateReplyMessage platformRemoteUpdateReplyMessage = message.getPlatformRemoteUpdateReplyMessage();
- log.info("业务消息处理:{}",platformRemoteUpdateReplyMessage);
- // 持久化消息
- PlatformRemoteUpdateReply platformRemoteUpdateReply = new PlatformRemoteUpdateReply();
- BeanUtils.copyProperties(platformRemoteUpdateReplyMessage,platformRemoteUpdateReply);
- platformRemoteUpdateReplyService.create(platformRemoteUpdateReply);
break;
}
}
--
Gitblit v1.7.1