Skip to content

Commit f7f35ff

Browse files
committed
feat: add device interface
1 parent e7e618e commit f7f35ff

File tree

5 files changed

+28
-15
lines changed

5 files changed

+28
-15
lines changed

mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/AssetResponse.java renamed to mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/DeviceRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
@Getter
77
@Setter
8-
public class AssetResponse {
9-
MTConnectAssets assets;
8+
public class DeviceRequest {
9+
private String id;
1010
}

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtConnectServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.github.openfacade.http.HttpServerFactory;
88
import io.github.openfacade.http.SyncRequestHandler;
99
import io.github.protocol.mtconnect.api.AssetRequest;
10-
import io.github.protocol.mtconnect.api.AssetResponse;
10+
import io.github.protocol.mtconnect.api.MTConnectAssets;
1111
import io.github.protocol.mtconnect.common.XmlUtil;
1212
import io.netty.handler.codec.http.HttpResponseStatus;
1313

@@ -35,11 +35,11 @@ public CompletableFuture<Void> start() {
3535
class MtAssetsHandler implements SyncRequestHandler {
3636
@Override
3737
public HttpResponse handle(HttpRequest request) {
38-
AssetResponse assetResponse = mtProcessor.asset(new AssetRequest());
38+
MTConnectAssets mtConnectAssets = mtProcessor.asset(new AssetRequest());
3939
// convert the response to http response
4040
String body;
4141
try {
42-
body = XmlUtil.toXml(assetResponse.getAssets());
42+
body = XmlUtil.toXml(mtConnectAssets);
4343
} catch (Exception e) {
4444
throw new RuntimeException(e);
4545
}
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package io.github.protocol.mtconnect.server;
22

33
import io.github.protocol.mtconnect.api.AssetRequest;
4-
import io.github.protocol.mtconnect.api.AssetResponse;
4+
import io.github.protocol.mtconnect.api.DeviceRequest;
5+
import io.github.protocol.mtconnect.api.MTConnectAssets;
6+
import io.github.protocol.mtconnect.api.MTConnectDevices;
57

68
public interface MtProcessor {
7-
AssetResponse asset(AssetRequest assetRequest);
9+
MTConnectAssets asset(AssetRequest assetRequest);
10+
MTConnectDevices device(DeviceRequest deviceRequest);
811
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package io.github.protocol.mtconnect.server.impl;
22

33
import io.github.protocol.mtconnect.api.AssetRequest;
4-
import io.github.protocol.mtconnect.api.AssetResponse;
4+
import io.github.protocol.mtconnect.api.DeviceRequest;
5+
import io.github.protocol.mtconnect.api.MTConnectAssets;
6+
import io.github.protocol.mtconnect.api.MTConnectDevices;
57
import io.github.protocol.mtconnect.server.MtProcessor;
68

79
public class IoTDAMtProcessor implements MtProcessor {
@@ -15,7 +17,12 @@ public IoTDAMtProcessor(String ak, String sk) {
1517
}
1618

1719
@Override
18-
public AssetResponse asset(AssetRequest assetRequest) {
20+
public MTConnectAssets asset(AssetRequest assetRequest) {
21+
return null;
22+
}
23+
24+
@Override
25+
public MTConnectDevices device(DeviceRequest deviceRequest) {
1926
return null;
2027
}
2128
}
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.github.protocol.mtconnect.server.impl;
22

33
import io.github.protocol.mtconnect.api.AssetRequest;
4-
import io.github.protocol.mtconnect.api.AssetResponse;
4+
import io.github.protocol.mtconnect.api.DeviceRequest;
55
import io.github.protocol.mtconnect.api.MTConnectAssets;
6+
import io.github.protocol.mtconnect.api.MTConnectDevices;
67
import io.github.protocol.mtconnect.server.MtProcessor;
78

89
import java.util.HashMap;
@@ -16,10 +17,12 @@ public class MemoryMtProcessor implements MtProcessor {
1617
Map<String, MTConnectAssets> mtConnectAssetsMap = new HashMap<>();
1718

1819
@Override
19-
public AssetResponse asset(AssetRequest assetRequest) {
20-
MTConnectAssets assets = mtConnectAssetsMap.get(assetRequest.getId());
21-
AssetResponse assetResponse = new AssetResponse();
22-
assetResponse.setAssets(assets);
23-
return assetResponse;
20+
public MTConnectAssets asset(AssetRequest assetRequest) {
21+
return mtConnectAssetsMap.get(assetRequest.getId());
22+
}
23+
24+
@Override
25+
public MTConnectDevices device(DeviceRequest deviceRequest) {
26+
return null;
2427
}
2528
}

0 commit comments

Comments
 (0)