From 1a766b855a026db90dffbad3cdf64e7b496833f0 Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Wed, 20 Nov 2024 22:55:22 +0800 Subject: [PATCH 1/2] fix: remove unnecessary field Signed-off-by: zhiheng123 <903292776@qq.com> --- .../mtconnect/examples/MTConnectIoTDAServerExample.java | 1 - .../protocol/mtconnect/server/impl/IoTDAMtProcessor.java | 6 ------ 2 files changed, 7 deletions(-) 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..93cf31d 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,7 +18,6 @@ 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") .build(); 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..461a014 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 @@ -23,7 +23,6 @@ public class IoTDAMtProcessor implements MTProcessor { private String ak; private String sk; - private String projectId; private String endpoint; private IoTDAClient client; @@ -62,11 +61,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; From b6cb74785f56d0fa10c5acb7b98c141a7a8bd27e Mon Sep 17 00:00:00 2001 From: zhiheng123 <903292776@qq.com> Date: Wed, 20 Nov 2024 23:53:41 +0800 Subject: [PATCH 2/2] feat: converse deivce of IoTDA Signed-off-by: zhiheng123 <903292776@qq.com> --- .../examples/MTConnectIoTDAServerExample.java | 2 +- .../server/impl/IoTDAMtProcessor.java | 26 +++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) 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 93cf31d..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,7 +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")) - .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 461a014..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,6 +20,8 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; + @Slf4j @NoArgsConstructor public class IoTDAMtProcessor implements MTProcessor { @@ -31,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()); @@ -45,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 devices = new ArrayList<>(); + if (response != null) { + for (QueryDeviceSimplify deviceSimplify : response.getDevices()) { + devices.add(convert2MTDevice(deviceSimplify)); + } + } + mtConnectDevices.setDevices(devices); + return mtConnectDevices; } public static class Builder {