From 9dc82f0523649a2cbf62d26938140c79bca33981 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
index 0269d52..3659dbc 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java
@@ -1,5 +1,7 @@
package com.ruoyi.integration.iotda.utils.produce;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.huaweicloud.sdk.core.exception.ConnectionException;
import com.huaweicloud.sdk.core.exception.RequestTimeoutException;
import com.huaweicloud.sdk.core.exception.ServiceResponseException;
@@ -25,18 +27,22 @@
@Autowired
private IotBuilder iotBuilder;
+
+ @Autowired
+ private IotDAConfig config;
+
/**
* 设备消息下发
- * @param deviceId 设备id
* @param name 消息名称
* @param message 消息内容
* @return
*/
@PostMapping("/sendMessage")
- public String sendMessage(String deviceId,String name,String message){
+ public String sendMessage(String code, String name, JSONObject message){
+ log.info("消息下发至设备：code={}，name={}，message={}", code, name, message);
CreateMessageRequest request = new CreateMessageRequest();
- request.withDeviceId(deviceId);
+ request.withDeviceId(code);
DeviceMessageRequest body = new DeviceMessageRequest();
body.withMessageId(UUID.randomUUID().toString());
body.withName(name);
@@ -44,19 +50,14 @@
request.withBody(body);
try {
CreateMessageResponse response = iotBuilder.buildIot().createMessage(request);
- System.out.println(response.toString());
- } catch (ConnectionException e) {
+ log.info("消息下发至设备结果：{}", JSON.toJSONString(response));
+ return JSON.toJSONString(response);
+ } catch (Exception e) {
e.printStackTrace();
- } catch (RequestTimeoutException e) {
- e.printStackTrace();
- } catch (ServiceResponseException e) {
- e.printStackTrace();
- System.out.println(e.getHttpStatusCode());
- System.out.println(e.getRequestId());
- System.out.println(e.getErrorCode());
- System.out.println(e.getErrorMsg());
+ log.info("消息下发至设备异常：code---{}，msg---{}", code, e.getMessage());
+ log.error("消息下发至设备异常：code---{}，msg---{}", code, e.getMessage());
+ return e.getMessage();
}
- return null;
}
}
\ No newline at end of file
--
Gitblit v1.7.1