From 7b55e2cd82647b87d79a778ed70fdbddb39ac00a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 24 九月 2024 13:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
index 2528cc6..7582df9 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java
@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RestController;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -25,7 +26,7 @@
* iot接口调用工具类
*/
@Slf4j
-@Component
+@RestController
public class IotInterfaceUtil {
private static final String dataFormat = "json";
@@ -40,10 +41,6 @@
private String decodeUrl(String url) {
return MessageFormat.format(url, iotDAConfig.getProjectId());
- }
-
- public static void main(String[] args) {
-
}
/**
@@ -116,16 +113,15 @@
/**
* 创建设备
* @param productId 产品ID
- * @param nodeId 设备标识码 通常使用IMEI、MAC地址或Serial No作为node_id
- * @param deviceId 设备ID 使用CodeGenerateUtils.generateVolumeSn()
+ * @param nodeId 设备标识码 设备编号
* @param deviceName 设备名称
* @param description 设备描述
* @return AddDeviceResponse
*/
- public AddDeviceResponse addDeviceRequest(String productId,String nodeId,String deviceId,String deviceName,String description) {
+ public AddDeviceResponse addDeviceRequest(String productId,String nodeId,String deviceName,String description) {
AddDeviceRequest request = new AddDeviceRequest();
AddDevice body = new AddDevice();
- body.withDeviceId(deviceId);
+ body.withDeviceId(nodeId);
body.withNodeId(nodeId);
body.withDeviceName(deviceName);
body.withProductId(productId);
--
Gitblit v1.7.1