fix 阿里云sdk

nb-admin/src/test/java/com/coffee/admin/AliyunTest.java

@@ -1,6 +1,8 @@
 package com.coffee.admin;
 
+import com.aliyuncs.iot.model.v20180120.QueryDeviceResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.coffee.aliyun.sdk.AliyunIotSdk;
 import com.coffee.bus.entity.BusDeviceEntity;
 import com.coffee.bus.entity.BusDeviceRunningEntity;
 import com.coffee.bus.entity.BusInfusionHistoryEntity;
@@ -36,6 +38,10 @@ public class AliyunTest {
     private LocalBusDeviceService deviceService;
     @Autowired
     private LocalBusInfusionHistoryService infusionHistoryService;
+
+    @Autowired
+    private AliyunIotSdk aliyunIotSdk;
+
     @Test
     public void test001(){
         BusDeviceRunningEntity pump = new BusDeviceRunningEntity();
@@ -66,4 +72,10 @@ public class AliyunTest {
         deviceService.updateBatchById(deviceList);
     }
 
+    @Test
+    public void test003(){
+        List<QueryDeviceResponse.DeviceInfo> deviceInfos = aliyunIotSdk.queryDevice();
+        System.out.println(deviceInfos.size());
+    }
+
 }

nb-system/src/main/java/com/coffee/aliyun/sdk/AliyunIotSdk.java

@@ -1,6 +1,5 @@
 package com.coffee.aliyun.sdk;
 
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.exceptions.ClientException;
@@ -39,12 +38,14 @@ public class AliyunIotSdk {
     private String accessKey;
     private String accessSecret;
     private String regionId;
+    private String iotInstanceId;
     // client
     private DefaultAcsClient client;
     public AliyunIotSdk(PlatformAccount platformAccount){
         this.accessKey = platformAccount.getAccessKey();
         this.accessSecret = platformAccount.getAccessSecret();
         this.regionId = platformAccount.getRegionId();
+        this.iotInstanceId = platformAccount.getIotInstanceId();
     }
 
     /**
@@ -140,6 +141,7 @@ public class AliyunIotSdk {
         // 获取阿里云SDK客户端
         DefaultAcsClient client = this.getAliyuniotClient();
         DeleteDeviceRequest request = new DeleteDeviceRequest();
+        request.setIotInstanceId(iotInstanceId);
         // 产品iotId，必需
         request.setIotId(iotId);
         try {
@@ -171,10 +173,10 @@ public class AliyunIotSdk {
             request.setPageSize(pageSize);
             request.setCurrentPage(currentPage);
             request.setProductKey(productKey);
-            log.debug("阿里云拉取请求 : productKey:【{}】",productKey);
+            request.setIotInstanceId(iotInstanceId);
             try {
                 QueryDeviceResponse response = client.getAcsResponse(request);
-                log.debug("阿里云响应：code：【{}】，data：【{}】",response.getCode(), JSONUtil.toJsonStr(response.getData()));
+                System.out.println(response.getSuccess());
                 // 获取失败直接跳出循环
                 if (!response.getSuccess()){
                     break;
@@ -309,6 +311,7 @@ public class AliyunIotSdk {
         QueryDeviceDetailRequest _request = new QueryDeviceDetailRequest();
         _request.setProductKey(productKey);
         _request.setDeviceName(deviceName);
+        _request.setIotInstanceId(iotInstanceId);
 
         QueryDeviceDetailResponse acsResponse = null;
         try {

pom.xml

@@ -280,8 +280,8 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-<!--                <profiles.active>prod</profiles.active>-->
-                <logging.level>debug</logging.level>
+                <profiles.active>prod</profiles.active>
+<!--                <logging.level>debug</logging.level>-->
             </properties>
             <activation>
                 <!-- 默认环境 -->