Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-28 bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3

 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;
@@ -13,12 +14,14 @@
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;

/**
 * iotda消息发送
 */
@Slf4j
@Component
@RestController
public class IotMessageProduce {

    @Autowired
@@ -31,7 +34,8 @@
     * @param message 消息内容
     * @return
     */
    public String sendMessage(String deviceId,String name,String message){
    @PostMapping("/sendMessage")
    public String sendMessage(String deviceId, String name, JSONObject message){
        CreateMessageRequest request = new CreateMessageRequest();
        request.withDeviceId(deviceId);
        DeviceMessageRequest body = new DeviceMessageRequest();