Skip to content

Commit 39d1c6d

Browse files
authored
feat: converse deivce of IoTDA (#23)
1 parent d28fa40 commit 39d1c6d

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

mtconnect-examples/src/main/java/io/github/protocol/mtconnect/examples/MTConnectIoTDAServerExample.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public static void main(String[] args) {
1818
IoTDAMtProcessor ioTDAMtProcessor = new IoTDAMtProcessor.Builder()
1919
.setAk(System.getenv("CLOUD_SDK_AK"))
2020
.setSk(System.getenv("CLOUD_SDK_SK"))
21-
.setProjectId("your_project_id")
22-
.setEndpoint("ec138732b4.st1.iotda-app.cn-north-4.myhuaweicloud.com")
21+
.setEndpoint(System.getenv("CLOUD_SDK_ENDPOINT"))
2322
.build();
2423

2524
configuration.setMtProcessor(ioTDAMtProcessor);

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,23 @@
1010
import com.huaweicloud.sdk.iotda.v5.IoTDAClient;
1111
import com.huaweicloud.sdk.iotda.v5.model.ListDevicesRequest;
1212
import com.huaweicloud.sdk.iotda.v5.model.ListDevicesResponse;
13+
import com.huaweicloud.sdk.iotda.v5.model.QueryDeviceSimplify;
1314
import io.github.protocol.mtconnect.api.AssetRequest;
15+
import io.github.protocol.mtconnect.api.Device;
1416
import io.github.protocol.mtconnect.api.DeviceRequest;
1517
import io.github.protocol.mtconnect.api.MTConnectAssets;
1618
import io.github.protocol.mtconnect.api.MTConnectDevices;
1719
import io.github.protocol.mtconnect.server.MTProcessor;
1820
import lombok.NoArgsConstructor;
1921
import lombok.extern.slf4j.Slf4j;
2022

23+
import java.util.ArrayList;
24+
2125
@Slf4j
2226
@NoArgsConstructor
2327
public class IoTDAMtProcessor implements MTProcessor {
2428
private String ak;
2529
private String sk;
26-
private String projectId;
2730
private String endpoint;
2831
private IoTDAClient client;
2932

@@ -32,11 +35,19 @@ public MTConnectAssets asset(AssetRequest assetRequest) {
3235
return null;
3336
}
3437

38+
private Device convert2MTDevice(QueryDeviceSimplify deviceSimplify) {
39+
Device device = new Device();
40+
device.setId(deviceSimplify.getDeviceId());
41+
device.setName(deviceSimplify.getDeviceName());
42+
return device;
43+
}
44+
3545
@Override
3646
public MTConnectDevices device(DeviceRequest deviceRequest) {
3747
ListDevicesRequest request = new ListDevicesRequest();
48+
ListDevicesResponse response = null;
3849
try {
39-
ListDevicesResponse response = client.listDevices(request);
50+
response = client.listDevices(request);
4051
log.info(response.toString());
4152
} catch (ConnectionException | RequestTimeoutException e) {
4253
log.error(e.getMessage());
@@ -46,8 +57,18 @@ public MTConnectDevices device(DeviceRequest deviceRequest) {
4657
log.error(e.getRequestId());
4758
log.error(e.getErrorCode());
4859
log.error(e.getErrorMsg());
60+
return null;
4961
}
50-
return null;
62+
63+
MTConnectDevices mtConnectDevices = new MTConnectDevices();
64+
ArrayList<Device> devices = new ArrayList<>();
65+
if (response != null) {
66+
for (QueryDeviceSimplify deviceSimplify : response.getDevices()) {
67+
devices.add(convert2MTDevice(deviceSimplify));
68+
}
69+
}
70+
mtConnectDevices.setDevices(devices);
71+
return mtConnectDevices;
5172
}
5273

5374
public static class Builder {
@@ -62,11 +83,6 @@ public Builder setSk(String sk) {
6283
return this;
6384
}
6485

65-
public Builder setProjectId(String projectId) {
66-
ioTDAMtProcessor.projectId = projectId;
67-
return this;
68-
}
69-
7086
public Builder setEndpoint(String endpoint) {
7187
ioTDAMtProcessor.endpoint = endpoint;
7288
return this;

0 commit comments

Comments
 (0)