简柏林 / thingskit · Commits

Commit 616f6a8b4f8a7ba1d84012d6c84440abea1c5a03

Authored by zbeacon
1 parent fd80cda3

Changed Provision statuses

Inline Side-by-side
Showing 5 changed files with 11 additions and 4 deletions
@@ -315,6 +315,7 @@ public class DefaultTransportApiService implements TransportApiService { @@ -315,6 +315,7 @@ public class DefaultTransportApiService implements TransportApiService {
315 .setCredentialsValue(deviceCredentials.getCredentialsValue() != null ? deviceCredentials.getCredentialsValue() : "") 315 .setCredentialsValue(deviceCredentials.getCredentialsValue() != null ? deviceCredentials.getCredentialsValue() : "")
316 .build(); 316 .build();
317 } 317 }
  318 +
318 private ListenableFuture<TransportApiResponseMsg> handle(GetTenantRoutingInfoRequestMsg requestMsg) { 319 private ListenableFuture<TransportApiResponseMsg> handle(GetTenantRoutingInfoRequestMsg requestMsg) {
319 TenantId tenantId = new TenantId(new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB())); 320 TenantId tenantId = new TenantId(new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB()));
320 // TODO: Tenant Profile from cache 321 // TODO: Tenant Profile from cache
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 package org.thingsboard.server.dao.device.provision; 16 package org.thingsboard.server.dao.device.provision;
17 17
18 public enum ProvisionResponseStatus { 18 public enum ProvisionResponseStatus {
19 - 19 + UNKNOWN,
20 SUCCESS, 20 SUCCESS,
21 NOT_FOUND, 21 NOT_FOUND,
22 FAILURE 22 FAILURE
@@ -271,9 +271,10 @@ message ProvisionDeviceResponseMsg { @@ -271,9 +271,10 @@ message ProvisionDeviceResponseMsg {
271 } 271 }
272 272
273 enum ProvisionResponseStatus { 273 enum ProvisionResponseStatus {
274 - SUCCESS = 0;  
275 - NOT_FOUND = 1;  
276 - FAILURE = 2; 274 + UNKNOWN = 0;
  275 + SUCCESS = 1;
  276 + NOT_FOUND = 2;
  277 + FAILURE = 3;
277 } 278 }
278 //Used to report session state to tb-Service and persist this state in the cache on the tb-Service level. 279 //Used to report session state to tb-Service and persist this state in the cache on the tb-Service level.
279 message SubscriptionInfoProto { 280 message SubscriptionInfoProto {
@@ -68,6 +68,7 @@ import java.io.IOException; @@ -68,6 +68,7 @@ import java.io.IOException;
68 import java.net.InetSocketAddress; 68 import java.net.InetSocketAddress;
69 import java.util.ArrayList; 69 import java.util.ArrayList;
70 import java.util.List; 70 import java.util.List;
  71 +import java.util.Optional;
71 import java.util.UUID; 72 import java.util.UUID;
72 import java.util.concurrent.ConcurrentHashMap; 73 import java.util.concurrent.ConcurrentHashMap;
73 import java.util.concurrent.ConcurrentMap; 74 import java.util.concurrent.ConcurrentMap;
@@ -43,6 +43,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType; @@ -43,6 +43,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType;
43 import org.thingsboard.server.gen.transport.TransportProtos.PostAttributeMsg; 43 import org.thingsboard.server.gen.transport.TransportProtos.PostAttributeMsg;
44 import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg; 44 import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg;
45 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg; 45 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
  46 +import org.thingsboard.server.gen.transport.TransportProtos.ProvisionResponseStatus;
46 import org.thingsboard.server.gen.transport.TransportProtos.TsKvListProto; 47 import org.thingsboard.server.gen.transport.TransportProtos.TsKvListProto;
47 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto; 48 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
48 49
@@ -411,8 +412,10 @@ public class JsonConverter { @@ -411,8 +412,10 @@ public class JsonConverter {
411 JsonObject result = new JsonObject(); 412 JsonObject result = new JsonObject();
412 if (payload.getProvisionResponseStatus() == TransportProtos.ProvisionResponseStatus.NOT_FOUND) { 413 if (payload.getProvisionResponseStatus() == TransportProtos.ProvisionResponseStatus.NOT_FOUND) {
413 result.addProperty("errorMsg", "Provision data was not found!"); 414 result.addProperty("errorMsg", "Provision data was not found!");
  415 + result.addProperty("provisionDeviceStatus", ProvisionResponseStatus.NOT_FOUND.name());
414 } else if (payload.getProvisionResponseStatus() == TransportProtos.ProvisionResponseStatus.FAILURE) { 416 } else if (payload.getProvisionResponseStatus() == TransportProtos.ProvisionResponseStatus.FAILURE) {
415 result.addProperty("errorMsg", "Failed to provision device!"); 417 result.addProperty("errorMsg", "Failed to provision device!");
  418 + result.addProperty("provisionDeviceStatus", ProvisionResponseStatus.FAILURE.name());
416 } else { 419 } else {
417 if (toGateway) { 420 if (toGateway) {
418 result.addProperty("id", requestId); 421 result.addProperty("id", requestId);
@@ -422,6 +425,7 @@ public class JsonConverter { @@ -422,6 +425,7 @@ public class JsonConverter {
422 result.addProperty("credentialsId", payload.getDeviceCredentials().getCredentialsId()); 425 result.addProperty("credentialsId", payload.getDeviceCredentials().getCredentialsId());
423 result.addProperty("credentialsValue", 426 result.addProperty("credentialsValue",
424 StringUtils.isEmpty(payload.getDeviceCredentials().getCredentialsValue()) ? null : payload.getDeviceCredentials().getCredentialsValue()); 427 StringUtils.isEmpty(payload.getDeviceCredentials().getCredentialsValue()) ? null : payload.getDeviceCredentials().getCredentialsValue());
  428 + result.addProperty("provisionDeviceStatus", ProvisionResponseStatus.SUCCESS.name());
425 } 429 }
426 return result; 430 return result;
427 } 431 }