From fca00ddabb395a44c99b0a39b47a7cd2955aede0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 10:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 89e9fc1..bd592d8 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
@@ -55,6 +55,8 @@
private PlatformRestartService platformRestartService;
@Autowired
private PlatformRemoteUpdateService platformRemoteUpdateService;
+ @Autowired
+ private QrCodeDeliveryService qrCodeDeliveryService;
/**
* 登录认证应答
@@ -62,6 +64,7 @@
* @return
*/
public JSONObject onlineReply(OnlineReply onlineReply){
+ log.info("登录认证应答:{}", onlineReply);
onlineReplyService.create(onlineReply);
return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
}
@@ -72,6 +75,7 @@
* @return
*/
public JSONObject pong(Pong pong){
+ log.info("心跳包应答:{}", pong);
pongService.create(pong);
return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
}
@@ -82,6 +86,7 @@
* @return
*/
public JSONObject billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
+ log.info("计费模型验证请求应答:{}", billingModeVerifyReply);
billingModeVerifyReplyService.create(billingModeVerifyReply);
return getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue());
}
@@ -92,6 +97,7 @@
* @return
*/
public JSONObject acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
+ log.info("计费模型验证请求应答:{}", acquisitionBillingModeReply);
acquisitionBillingModeReplyService.create(acquisitionBillingModeReply);
return getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue());
}
@@ -102,6 +108,7 @@
* @return
*/
public JSONObject readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
+ log.info("读取实时监测数据:{}", readRealTimeMonitoringData);
readRealTimeMonitoringDataService.create(readRealTimeMonitoringData);
return getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue());
}
@@ -264,6 +271,16 @@
}
/**
+ * 二维码下发
+ * @param qrCodeDelivery 实体对象
+ * @return
+ */
+ public JSONObject qrCodeDelivery(QrCodeDelivery qrCodeDelivery){
+ qrCodeDeliveryService.create(qrCodeDelivery);
+ return getMessageJsonString(qrCodeDelivery, ServiceIdMenu.QR_CODE_DELIVERY.getValue());
+ }
+
+ /**
* 统一封装消息
* @param object 实体对象
* @param serviceId 服务ID
--
Gitblit v1.7.1