10
10
import com .huaweicloud .sdk .iotda .v5 .IoTDAClient ;
11
11
import com .huaweicloud .sdk .iotda .v5 .model .ListDevicesRequest ;
12
12
import com .huaweicloud .sdk .iotda .v5 .model .ListDevicesResponse ;
13
+ import com .huaweicloud .sdk .iotda .v5 .model .QueryDeviceSimplify ;
13
14
import io .github .protocol .mtconnect .api .AssetRequest ;
15
+ import io .github .protocol .mtconnect .api .Device ;
14
16
import io .github .protocol .mtconnect .api .DeviceRequest ;
15
17
import io .github .protocol .mtconnect .api .MTConnectAssets ;
16
18
import io .github .protocol .mtconnect .api .MTConnectDevices ;
17
19
import io .github .protocol .mtconnect .server .MTProcessor ;
18
20
import lombok .NoArgsConstructor ;
19
21
import lombok .extern .slf4j .Slf4j ;
20
22
23
+ import java .util .ArrayList ;
24
+
21
25
@ Slf4j
22
26
@ NoArgsConstructor
23
27
public class IoTDAMtProcessor implements MTProcessor {
24
28
private String ak ;
25
29
private String sk ;
26
- private String projectId ;
27
30
private String endpoint ;
28
31
private IoTDAClient client ;
29
32
@@ -32,11 +35,19 @@ public MTConnectAssets asset(AssetRequest assetRequest) {
32
35
return null ;
33
36
}
34
37
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
+
35
45
@ Override
36
46
public MTConnectDevices device (DeviceRequest deviceRequest ) {
37
47
ListDevicesRequest request = new ListDevicesRequest ();
48
+ ListDevicesResponse response = null ;
38
49
try {
39
- ListDevicesResponse response = client .listDevices (request );
50
+ response = client .listDevices (request );
40
51
log .info (response .toString ());
41
52
} catch (ConnectionException | RequestTimeoutException e ) {
42
53
log .error (e .getMessage ());
@@ -46,8 +57,18 @@ public MTConnectDevices device(DeviceRequest deviceRequest) {
46
57
log .error (e .getRequestId ());
47
58
log .error (e .getErrorCode ());
48
59
log .error (e .getErrorMsg ());
60
+ return null ;
49
61
}
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 ;
51
72
}
52
73
53
74
public static class Builder {
@@ -62,11 +83,6 @@ public Builder setSk(String sk) {
62
83
return this ;
63
84
}
64
85
65
- public Builder setProjectId (String projectId ) {
66
- ioTDAMtProcessor .projectId = projectId ;
67
- return this ;
68
- }
69
-
70
86
public Builder setEndpoint (String endpoint ) {
71
87
ioTDAMtProcessor .endpoint = endpoint ;
72
88
return this ;
0 commit comments