From 8ef73a8875b9b618e471aafc383f85ba6ab7a154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 19:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..009e8f1 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,6 @@
package com.ruoyi.integration.iotda.utils.produce;
+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 +26,27 @@
@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){
CreateMessageRequest request = new CreateMessageRequest();
- request.withDeviceId(deviceId);
+ 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());
+ }
DeviceMessageRequest body = new DeviceMessageRequest();
body.withMessageId(UUID.randomUUID().toString());
body.withName(name);
--
Gitblit v1.7.1