Browse Source

connectivity upgrade fix

pull/9539/head
YevhenBondarenko 3 years ago
parent
commit
41ec20aa6f
  1. 13
      application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

13
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

@ -223,7 +223,6 @@ public class DefaultDataUpdateService implements DataUpdateService {
case "3.5.1": case "3.5.1":
log.info("Updating data from version 3.5.1 to 3.6.0 ..."); log.info("Updating data from version 3.5.1 to 3.6.0 ...");
migrateEdgeEvents("Starting edge events migration - adding seq_id column. "); migrateEdgeEvents("Starting edge events migration - adding seq_id column. ");
migrateDeviceConnectivity();
break; break;
case "3.6.0": case "3.6.0":
log.info("Updating data from version 3.6.0 to 3.6.1 ..."); log.info("Updating data from version 3.6.0 to 3.6.1 ...");
@ -245,11 +244,13 @@ public class DefaultDataUpdateService implements DataUpdateService {
} }
private void migrateDeviceConnectivity() { private void migrateDeviceConnectivity() {
AdminSettings connectivitySettings = new AdminSettings(); if (adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "connectivity") == null) {
connectivitySettings.setTenantId(TenantId.SYS_TENANT_ID); AdminSettings connectivitySettings = new AdminSettings();
connectivitySettings.setKey("connectivity"); connectivitySettings.setTenantId(TenantId.SYS_TENANT_ID);
connectivitySettings.setJsonValue(JacksonUtil.valueToTree(connectivityConfiguration.getConnectivity())); connectivitySettings.setKey("connectivity");
adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, connectivitySettings); connectivitySettings.setJsonValue(JacksonUtil.valueToTree(connectivityConfiguration.getConnectivity()));
adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, connectivitySettings);
}
} }
@Override @Override

Loading…
Cancel
Save