dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
dashevchenko 2023-06-21 18:37:27 +03:00
parent 11cb696d5c
commit 66623a2be2
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View File

@ -77,7 +77,6 @@ import org.thingsboard.server.service.security.system.SystemSecurityService;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -174,12 +173,9 @@ public class DeviceController extends BaseController {
checkParameter(DEVICE_ID, strDeviceId); checkParameter(DEVICE_ID, strDeviceId);
DeviceId deviceId = new DeviceId(toUUID(strDeviceId)); DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
Device device = checkDeviceId(deviceId, Operation.READ_CREDENTIALS); Device device = checkDeviceId(deviceId, Operation.READ_CREDENTIALS);
URI baseUri = new URI(systemSecurityService.getBaseUrl(getTenantId(), getCurrentUser().getCustomerId(), request));
List<String> commands = deviceService.findDevicePublishTelemetryCommands(device); String baseUrl = systemSecurityService.getBaseUrl(getTenantId(), getCurrentUser().getCustomerId(), request);
return commands.stream() return deviceService.findDevicePublishTelemetryCommands(baseUrl, device);
.map(s -> s.replace("$THINGSBOARD_HOST_NAME", baseUri.getHost())
.replace("$THINGSBOARD_BASE_URL", baseUri.toString()))
.collect(Collectors.toList());
} }
@ApiOperation(value = "Create Or Update Device (saveDevice)", @ApiOperation(value = "Create Or Update Device (saveDevice)",

3
common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
View File

@ -36,6 +36,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.dao.device.provision.ProvisionRequest; import org.thingsboard.server.dao.device.provision.ProvisionRequest;
import org.thingsboard.server.dao.entity.EntityDaoService; import org.thingsboard.server.dao.entity.EntityDaoService;
import java.net.URISyntaxException;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -43,7 +44,7 @@ public interface DeviceService extends EntityDaoService {
DeviceInfo findDeviceInfoById(TenantId tenantId, DeviceId deviceId); DeviceInfo findDeviceInfoById(TenantId tenantId, DeviceId deviceId);
List<String> findDevicePublishTelemetryCommands(Device device); List<String> findDevicePublishTelemetryCommands(String baseUrl, Device device) throws URISyntaxException;
Device findDeviceById(TenantId tenantId, DeviceId deviceId); Device findDeviceById(TenantId tenantId, DeviceId deviceId);

46
dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
View File

@ -19,7 +19,6 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -80,6 +79,8 @@ import org.thingsboard.server.dao.exception.IncorrectParameterException;
import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.DataValidator;
import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.service.PaginatedRemover;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@ -129,11 +130,12 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
} }
@Override @Override
public List<String> findDevicePublishTelemetryCommands(Device device) { public List<String> findDevicePublishTelemetryCommands(String baseUrl, Device device) throws URISyntaxException {
DeviceId deviceId = device.getId(); DeviceId deviceId = device.getId();
log.trace("Executing findDevicePublishTelemetryCommands [{}]", deviceId); log.trace("Executing findDevicePublishTelemetryCommands [{}]", deviceId);
validateId(deviceId, INCORRECT_DEVICE_ID + deviceId); validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
String hostname = new URI(baseUrl).getHost();
DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), deviceId); DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), deviceId);
DeviceCredentialsType credentialsType = deviceCredentials.getCredentialsType(); DeviceCredentialsType credentialsType = deviceCredentials.getCredentialsType();
@ -144,15 +146,15 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
case DEFAULT: case DEFAULT:
switch (credentialsType) { switch (credentialsType) {
case ACCESS_TOKEN: case ACCESS_TOKEN:
commands.add(getMqttAccessTokenCommand(deviceCredentials) + " -m {temperature:15}"); commands.add(getMqttAccessTokenCommand(hostname, deviceCredentials) + " -m \"{temperature:15}\"");
commands.add(getHttpAccessTokenCommand(deviceCredentials) + " --data \"{temperature:16}\""); commands.add(getHttpAccessTokenCommand(baseUrl, deviceCredentials));
commands.add("echo -n {temperature:17} | " + getCoapAccessTokenCommand(deviceCredentials) + " -f-"); commands.add("echo -n \"{temperature:17}\" | " + getCoapAccessTokenCommand(hostname, deviceCredentials) + " -f-");
break; break;
case MQTT_BASIC: case MQTT_BASIC:
commands.add(getMqttBasicPublishCommand(deviceCredentials) + " -m {temperature:18}"); commands.add(getMqttBasicPublishCommand(hostname, deviceCredentials) + " -m \"{temperature:18}\"");
break; break;
case X509_CERTIFICATE: case X509_CERTIFICATE:
commands.add(getMqttX509Command() + " -m {temperature:19}"); commands.add(getMqttX509Command(hostname) + " -m \"{temperature:19}\"");
break; break;
} }
break; break;
@ -160,16 +162,16 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
MqttDeviceProfileTransportConfiguration transportConfiguration = MqttDeviceProfileTransportConfiguration transportConfiguration =
(MqttDeviceProfileTransportConfiguration) deviceProfile.getProfileData().getTransportConfiguration(); (MqttDeviceProfileTransportConfiguration) deviceProfile.getProfileData().getTransportConfiguration();
TransportPayloadType payloadType = transportConfiguration.getTransportPayloadTypeConfiguration().getTransportPayloadType(); TransportPayloadType payloadType = transportConfiguration.getTransportPayloadTypeConfiguration().getTransportPayloadType();
String payload = (payloadType == TransportPayloadType.PROTOBUF) ? " -f protobufFileName" : " -m {temperature:25}"; String payload = (payloadType == TransportPayloadType.PROTOBUF) ? " -f protobufFileName" : " -m \"{temperature:25}\"";
switch (credentialsType) { switch (credentialsType) {
case ACCESS_TOKEN: case ACCESS_TOKEN:
commands.add(getMqttAccessTokenCommand(deviceCredentials) + payload); commands.add(getMqttAccessTokenCommand(hostname, deviceCredentials) + payload);
break; break;
case MQTT_BASIC: case MQTT_BASIC:
commands.add(getMqttBasicPublishCommand(deviceCredentials) + payload); commands.add(getMqttBasicPublishCommand(hostname, deviceCredentials) + payload);
break; break;
case X509_CERTIFICATE: case X509_CERTIFICATE:
commands.add(getMqttX509Command() + payload); commands.add(getMqttX509Command(hostname) + payload);
break; break;
} }
break; break;
@ -182,7 +184,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
(DefaultCoapDeviceTypeConfiguration) coapTransportConfiguration.getCoapDeviceTypeConfiguration(); (DefaultCoapDeviceTypeConfiguration) coapTransportConfiguration.getCoapDeviceTypeConfiguration();
TransportPayloadType transportPayloadType = configuration.getTransportPayloadTypeConfiguration().getTransportPayloadType(); TransportPayloadType transportPayloadType = configuration.getTransportPayloadTypeConfiguration().getTransportPayloadType();
String payloadExample = (transportPayloadType == TransportPayloadType.PROTOBUF) ? " -t binary -f protobufFileName" : " -t json -f jsonFileName"; String payloadExample = (transportPayloadType == TransportPayloadType.PROTOBUF) ? " -t binary -f protobufFileName" : " -t json -f jsonFileName";
commands.add(getCoapAccessTokenCommand(deviceCredentials) + payloadExample); commands.add(getCoapAccessTokenCommand(hostname, deviceCredentials) + payloadExample);
} }
break; break;
} }
@ -748,17 +750,17 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
return EntityType.DEVICE; return EntityType.DEVICE;
} }
private static String getHttpAccessTokenCommand(DeviceCredentials deviceCredentials) { private String getHttpAccessTokenCommand(String baseurl, DeviceCredentials deviceCredentials) {
return String.format("curl -v -X POST $THINGSBOARD_BASE_URL/api/v1/%s/telemetry --header Content-Type:application/json", deviceCredentials.getCredentialsId()); return String.format("curl -v -X POST %s/api/v1/%s/telemetry --header Content-Type:application/json --data \"{temperature:16}\"", baseurl, deviceCredentials.getCredentialsId());
} }
private static String getMqttAccessTokenCommand(DeviceCredentials deviceCredentials) { private String getMqttAccessTokenCommand(String hostname, DeviceCredentials deviceCredentials) {
return String.format("mosquitto_pub -d -q 1 -h $THINGSBOARD_HOST_NAME -t v1/devices/me/telemetry -u %s", deviceCredentials.getCredentialsId()); return String.format("mosquitto_pub -d -q 1 -h %s -t v1/devices/me/telemetry -u %s", hostname, deviceCredentials.getCredentialsId());
} }
private String getMqttBasicPublishCommand(DeviceCredentials deviceCredentials) { private String getMqttBasicPublishCommand(String hostname, DeviceCredentials deviceCredentials) {
BasicMqttCredentials credentials = JacksonUtil.fromString(deviceCredentials.getCredentialsValue(), BasicMqttCredentials.class); BasicMqttCredentials credentials = JacksonUtil.fromString(deviceCredentials.getCredentialsValue(), BasicMqttCredentials.class);
StringBuilder command = new StringBuilder("mosquitto_pub -d -q 1 -h $THINGSBOARD_HOST_NAME -p 1883 -t v1/devices/me/telemetry"); StringBuilder command = new StringBuilder("mosquitto_pub -d -q 1 -h " + hostname + " -p 1883 -t v1/devices/me/telemetry");
if (credentials != null) { if (credentials != null) {
if (credentials.getClientId() != null) { if (credentials.getClientId() != null) {
command.append(" -i ").append(credentials.getClientId()); command.append(" -i ").append(credentials.getClientId());
@ -773,11 +775,11 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
return command.toString(); return command.toString();
} }
private static String getMqttX509Command() { private String getMqttX509Command(String hostname) {
return "mosquitto_pub --cafile server.pem -d -q 1 -h $THINGSBOARD_HOST_NAME -p 8883 -t v1/devices/me/telemetry --key key.pem --cert cert.pem"; return String.format("mosquitto_pub --cafile server.pem -d -q 1 -h %s -p 8883 -t v1/devices/me/telemetry --key key.pem --cert cert.pem", hostname);
} }
private static String getCoapAccessTokenCommand(DeviceCredentials deviceCredentials) { private String getCoapAccessTokenCommand(String hostname, DeviceCredentials deviceCredentials) {
return String.format("coap-client -m post coap://$THINGSBOARD_HOST_NAME:5683/api/v1/%s/telemetry", deviceCredentials.getCredentialsId()); return String.format("coap-client -m post coap://%s:5683/api/v1/%s/telemetry", hostname, deviceCredentials.getCredentialsId());
} }
} }