diff --git a/mtconnect-examples/src/main/java/io/github/protocol/mtconnect/examples/MTConnectIoTDAServerExample.java b/mtconnect-examples/src/main/java/io/github/protocol/mtconnect/examples/MTConnectIoTDAServerExample.java
index 50d1eb1..6ac3d50 100644
--- a/mtconnect-examples/src/main/java/io/github/protocol/mtconnect/examples/MTConnectIoTDAServerExample.java
+++ b/mtconnect-examples/src/main/java/io/github/protocol/mtconnect/examples/MTConnectIoTDAServerExample.java
@@ -18,8 +18,7 @@ public static void main(String[] args) {
         IoTDAMtProcessor ioTDAMtProcessor = new IoTDAMtProcessor.Builder()
                 .setAk(System.getenv("CLOUD_SDK_AK"))
                 .setSk(System.getenv("CLOUD_SDK_SK"))
-                .setProjectId("your_project_id")
-                .setEndpoint("ec138732b4.st1.iotda-app.cn-north-4.myhuaweicloud.com")
+                .setEndpoint(System.getenv("CLOUD_SDK_ENDPOINT"))
                 .build();
 
         configuration.setMtProcessor(ioTDAMtProcessor);
diff --git a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java
index 00564da..bfe3e44 100644
--- a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java
+++ b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java
@@ -10,7 +10,9 @@
 import com.huaweicloud.sdk.iotda.v5.IoTDAClient;
 import com.huaweicloud.sdk.iotda.v5.model.ListDevicesRequest;
 import com.huaweicloud.sdk.iotda.v5.model.ListDevicesResponse;
+import com.huaweicloud.sdk.iotda.v5.model.QueryDeviceSimplify;
 import io.github.protocol.mtconnect.api.AssetRequest;
+import io.github.protocol.mtconnect.api.Device;
 import io.github.protocol.mtconnect.api.DeviceRequest;
 import io.github.protocol.mtconnect.api.MTConnectAssets;
 import io.github.protocol.mtconnect.api.MTConnectDevices;
@@ -18,12 +20,13 @@
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.ArrayList;
+
 @Slf4j
 @NoArgsConstructor
 public class IoTDAMtProcessor implements MTProcessor {
     private String ak;
     private String sk;
-    private String projectId;
     private String endpoint;
     private IoTDAClient client;
 
@@ -32,11 +35,19 @@ public MTConnectAssets asset(AssetRequest assetRequest) {
         return null;
     }
 
+    private Device convert2MTDevice(QueryDeviceSimplify deviceSimplify) {
+        Device device = new Device();
+        device.setId(deviceSimplify.getDeviceId());
+        device.setName(deviceSimplify.getDeviceName());
+        return device;
+    }
+
     @Override
     public MTConnectDevices device(DeviceRequest deviceRequest) {
         ListDevicesRequest request = new ListDevicesRequest();
+        ListDevicesResponse response = null;
         try {
-            ListDevicesResponse response = client.listDevices(request);
+            response = client.listDevices(request);
             log.info(response.toString());
         } catch (ConnectionException | RequestTimeoutException e) {
             log.error(e.getMessage());
@@ -46,8 +57,18 @@ public MTConnectDevices device(DeviceRequest deviceRequest) {
             log.error(e.getRequestId());
             log.error(e.getErrorCode());
             log.error(e.getErrorMsg());
+            return null;
         }
-        return null;
+
+        MTConnectDevices mtConnectDevices = new MTConnectDevices();
+        ArrayList<Device> devices = new ArrayList<>();
+        if (response != null) {
+            for (QueryDeviceSimplify deviceSimplify : response.getDevices()) {
+                devices.add(convert2MTDevice(deviceSimplify));
+            }
+        }
+        mtConnectDevices.setDevices(devices);
+        return mtConnectDevices;
     }
 
     public static class Builder {
@@ -62,11 +83,6 @@ public Builder setSk(String sk) {
             return this;
         }
 
-        public Builder setProjectId(String projectId) {
-            ioTDAMtProcessor.projectId = projectId;
-            return this;
-        }
-
         public Builder setEndpoint(String endpoint) {
             ioTDAMtProcessor.endpoint = endpoint;
             return this;