From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 20 九月 2024 10:47:53 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java | 9 +++------ 1 files changed, 3 insertions(+), 6 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..77aeab2 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) { - } /** @@ -117,7 +114,7 @@ * 创建设备 * @param productId 产品ID * @param nodeId 设备标识码 通常使用IMEI、MAC地址或Serial No作为node_id - * @param deviceId 设备ID 使用CodeGenerateUtils.generateVolumeSn() + * @param deviceId 设备ID 使用设备标识码 * @param deviceName 设备名称 * @param description 设备描述 * @return AddDeviceResponse -- Gitblit v1.7.1