From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
index e7f11c8..caab60d 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -2,12 +2,16 @@
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.integration.api.model.*;
import com.ruoyi.integration.iotda.enums.ServiceIdMenu;
-import com.ruoyi.integration.mongodb.model.*;
import com.ruoyi.integration.mongodb.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
@Slf4j
@Component
@@ -46,6 +50,8 @@
@Autowired
private TimingSettingService timingSettingService;
@Autowired
+ private TimingSettingReplyService timingSettingReplyService;
+ @Autowired
private SetupBillingModelService setupBillingModelService;
@Autowired
private OpenOrCloseGroundLockService openOrCloseGroundLockService;
@@ -54,14 +60,17 @@
@Autowired
private PlatformRemoteUpdateService platformRemoteUpdateService;
@Autowired
- private MessageConvertUtil messageConvertUtil;
+ private QrCodeDeliveryService qrCodeDeliveryService;
+ @Resource
+ private RedisTemplate redisTemplate;
/**
* 登录认证应答
* @param onlineReply 实体对象
* @return
*/
- public String onlineReply(OnlineReply onlineReply){
+ public JSONObject onlineReply(OnlineReply onlineReply){
+ log.info("登录认证应答:{}", onlineReply);
onlineReplyService.create(onlineReply);
return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
}
@@ -71,8 +80,11 @@
* @param pong 实体对象
* @return
*/
- public String pong(Pong pong){
- pongService.create(pong);
+ public JSONObject pong(Pong pong){
+ log.info("心跳包应答:{}", pong);
+// pongService.create(pong);
+ //存储缓存中，5分钟有效
+ redisTemplate.opsForValue().set("pong:" + pong.getCharging_pile_code() + pong.getCharging_gun_code(), pong, 5, TimeUnit.MINUTES);
return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
}
@@ -81,7 +93,8 @@
* @param billingModeVerifyReply 实体对象
* @return
*/
- public String billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
+ public JSONObject billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
+ log.info("计费模型验证请求应答:{}", billingModeVerifyReply);
billingModeVerifyReplyService.create(billingModeVerifyReply);
return getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue());
}
@@ -91,7 +104,8 @@
* @param acquisitionBillingModeReply 实体对象
* @return
*/
- public String acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
+ public JSONObject acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
+ log.info("计费模型验证请求应答:{}", acquisitionBillingModeReply);
acquisitionBillingModeReplyService.create(acquisitionBillingModeReply);
return getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue());
}
@@ -101,7 +115,8 @@
* @param readRealTimeMonitoringData 实体对象
* @return
*/
- public String readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
+ public JSONObject readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
+ log.info("读取实时监测数据:{}", readRealTimeMonitoringData);
readRealTimeMonitoringDataService.create(readRealTimeMonitoringData);
return getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue());
}
@@ -111,17 +126,17 @@
* @param endCharge 实体对象
* @return
*/
- public String endCharge(EndCharge endCharge){
- endChargeService.create(endCharge);
- return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
- }
+// public String endCharge(EndCharge endCharge){
+// endChargeService.create(endCharge);
+// return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
+// }
/**
* 运营平台确认启动充电
* @param platformConfirmationCharging 实体对象
* @return
*/
- public String platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging){
+ public JSONObject platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging){
platformConfirmationChargingService.create(platformConfirmationCharging);
return getMessageJsonString(platformConfirmationCharging, ServiceIdMenu.PLATFORM_CONFIRMATION_CHARGING.getValue());
}
@@ -131,7 +146,7 @@
* @param platformStartCharging 实体对象
* @return
*/
- public String platformConfirmationCharging(PlatformStartCharging platformStartCharging){
+ public JSONObject platformStartCharging(PlatformStartCharging platformStartCharging){
platformStartChargingService.create(platformStartCharging);
return getMessageJsonString(platformStartCharging, ServiceIdMenu.PLATFORM_START_CHARGING.getValue());
}
@@ -141,7 +156,7 @@
* @param platformStopCharging 实体对象
* @return
*/
- public String platformStopCharging(PlatformStopCharging platformStopCharging){
+ public JSONObject platformStopCharging(PlatformStopCharging platformStopCharging){
platformStopChargingService.create(platformStopCharging);
return getMessageJsonString(platformStopCharging, ServiceIdMenu.PLATFORM_STOP_CHARGING.getValue());
}
@@ -151,7 +166,7 @@
* @param confirmTransactionRecord 实体对象
* @return
*/
- public String confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){
+ public JSONObject confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){
confirmTransactionRecordService.create(confirmTransactionRecord);
return getMessageJsonString(confirmTransactionRecord, ServiceIdMenu.CONFIRM_TRANSACTION_RECORD.getValue());
}
@@ -161,7 +176,7 @@
* @param updateBalance 实体对象
* @return
*/
- public String updateBalance(UpdateBalance updateBalance){
+ public JSONObject updateBalance(UpdateBalance updateBalance){
updateBalanceService.create(updateBalance);
return getMessageJsonString(updateBalance, ServiceIdMenu.UPDATE_BALANCE.getValue());
}
@@ -171,7 +186,7 @@
* @param synchronizeOfflineCard 实体对象
* @return
*/
- public String synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){
+ public JSONObject synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){
synchronizeOfflineCardService.create(synchronizeOfflineCard);
return getMessageJsonString(synchronizeOfflineCard, ServiceIdMenu.SYNCHRONIZE_OFFLINE_CARD.getValue());
}
@@ -181,7 +196,7 @@
* @param clearOfflineCard 实体对象
* @return
*/
- public String clearOfflineCard(ClearOfflineCard clearOfflineCard){
+ public JSONObject clearOfflineCard(ClearOfflineCard clearOfflineCard){
clearOfflineCardService.create(clearOfflineCard);
return getMessageJsonString(clearOfflineCard, ServiceIdMenu.CLEAR_OFFLINE_CARD.getValue());
}
@@ -191,7 +206,7 @@
* @param queryOfflineCard 实体对象
* @return
*/
- public String queryOfflineCard(QueryOfflineCard queryOfflineCard){
+ public JSONObject queryOfflineCard(QueryOfflineCard queryOfflineCard){
queryOfflineCardService.create(queryOfflineCard);
return getMessageJsonString(queryOfflineCard, ServiceIdMenu.QUERY_OFFLINE_CARD.getValue());
}
@@ -201,7 +216,7 @@
* @param workingParameterSetting 实体对象
* @return
*/
- public String workingParameterSetting(WorkingParameterSetting workingParameterSetting){
+ public JSONObject workingParameterSetting(WorkingParameterSetting workingParameterSetting){
workingParameterSettingService.create(workingParameterSetting);
return getMessageJsonString(workingParameterSetting, ServiceIdMenu.WORKING_PARAMETER_SETTING.getValue());
}
@@ -211,9 +226,18 @@
* @param timingSetting 实体对象
* @return
*/
- public String timingSetting(TimingSetting timingSetting){
+ public JSONObject timingSetting(TimingSetting timingSetting){
timingSettingService.create(timingSetting);
return getMessageJsonString(timingSetting, ServiceIdMenu.TIMING_SETTING.getValue());
+ }
+ /**
+ * 对时设置应答
+ * @param timingSettingReply 实体对象
+ * @return
+ */
+ public JSONObject timingSettingReply(TimingSettingReply timingSettingReply){
+ timingSettingReplyService.create(timingSettingReply);
+ return getMessageJsonString(timingSettingReply, ServiceIdMenu.TIMING_SETTING_REPLY.getValue());
}
/**
@@ -221,7 +245,7 @@
* @param setupBillingModel 实体对象
* @return
*/
- public String setupBillingModel(SetupBillingModel setupBillingModel){
+ public JSONObject setupBillingModel(SetupBillingModel setupBillingModel){
setupBillingModelService.create(setupBillingModel);
return getMessageJsonString(setupBillingModel, ServiceIdMenu.SETUP_BILLING_MODEL.getValue());
}
@@ -231,7 +255,7 @@
* @param openOrCloseGroundLock 实体对象
* @return
*/
- public String openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){
+ public JSONObject openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){
openOrCloseGroundLockService.create(openOrCloseGroundLock);
return getMessageJsonString(openOrCloseGroundLock, ServiceIdMenu.OPEN_OR_CLOSE_GROUND_LOCK.getValue());
}
@@ -240,7 +264,7 @@
* @param platformRestart 实体对象
* @return
*/
- public String platformRestart(PlatformRestart platformRestart){
+ public JSONObject platformRestart(PlatformRestart platformRestart){
platformRestartService.create(platformRestart);
return getMessageJsonString(platformRestart, ServiceIdMenu.PLATFORM_RESTART.getValue());
}
@@ -249,9 +273,19 @@
* @param platformRemoteUpdate 实体对象
* @return
*/
- public String platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){
+ public JSONObject platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){
platformRemoteUpdateService.create(platformRemoteUpdate);
return getMessageJsonString(platformRemoteUpdate, ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getValue());
+ }
+
+ /**
+ * 二维码下发
+ * @param qrCodeDelivery 实体对象
+ * @return
+ */
+ public JSONObject qrCodeDelivery(QrCodeDelivery qrCodeDelivery){
+ qrCodeDeliveryService.create(qrCodeDelivery);
+ return getMessageJsonString(qrCodeDelivery, ServiceIdMenu.QR_CODE_DELIVERY.getValue());
}
/**
@@ -260,9 +294,10 @@
* @param serviceId 服务ID
* @return
*/
- public String getMessageJsonString(Object object, String serviceId){
+ public JSONObject getMessageJsonString(Object object, String serviceId){
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object));
jsonObject.put("service_id", serviceId);
- return jsonObject.toJSONString();
+ log.info("发送数据service_id：{},发送内容：{}",serviceId,jsonObject);
+ return jsonObject;
}
}
--
Gitblit v1.7.1