From 50dde470ec18f292e8e58547ef1c4a4cbd4138b2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 24 九月 2025 15:08:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 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 009e8f1..4ca0ffb 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,19 +1,14 @@
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;
-import com.huaweicloud.sdk.iotda.v5.IoTDAClient;
import com.huaweicloud.sdk.iotda.v5.model.CreateMessageRequest;
import com.huaweicloud.sdk.iotda.v5.model.CreateMessageResponse;
import com.huaweicloud.sdk.iotda.v5.model.DeviceMessageRequest;
import com.ruoyi.common.core.utils.uuid.UUID;
import com.ruoyi.integration.iotda.builder.IotBuilder;
-import com.ruoyi.integration.iotda.config.IotDAConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,9 +22,6 @@
@Autowired
private IotBuilder iotBuilder;
- @Autowired
- private IotDAConfig config;
-
/**
* 设备消息下发
@@ -40,13 +32,7 @@
@PostMapping("/sendMessage")
public String sendMessage(String code, String name, JSONObject message){
CreateMessageRequest request = new CreateMessageRequest();
- System.err.println(code);
- System.err.println(JSONObject.toJSONString(config));
- if(config.getTest() && code.equals(config.getTestDriverCode())){
- request.withDeviceId(config.getTestDeviceId());
- }else{
- request.withDeviceId(config.getDeviceId());
- }
+ request.withDeviceId(code);
DeviceMessageRequest body = new DeviceMessageRequest();
body.withMessageId(UUID.randomUUID().toString());
body.withName(name);
@@ -54,19 +40,11 @@
request.withBody(body);
try {
CreateMessageResponse response = iotBuilder.buildIot().createMessage(request);
- System.out.println(response.toString());
- } catch (ConnectionException e) {
+ 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());
+ return e.getMessage();
}
- return null;
}
}
\ No newline at end of file
--
Gitblit v1.7.1