Merge branch '20230724' into 'master_dev'

fix: 创建和编辑事务问题修复

See merge request yunteng/thingskit!215

@@ -38,6 +38,7 @@ import org.thingsboard.server.dao.yunteng.service.TkUserService;
 import org.thingsboard.server.service.install.InstallScripts;
 import org.thingsboard.server.service.security.permission.Operation;
 
+import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
@@ -212,7 +213,7 @@ public class TkAdminController extends BaseController {
   @Transactional
   public TenantDTO updateOrCreateTenant(
       @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO)
-      throws ThingsboardException {
+      throws ThingsboardException, IOException {
     updateOrSaveTenant(tenantReqDTO);
     return tkTenantService.updateOrCreateTenant(tenantReqDTO);
   }
@@ -252,8 +253,7 @@ public class TkAdminController extends BaseController {
     }
   }
 
-  private void updateOrSaveTenant(TenantReqDTO tenantReqDTO) throws ThingsboardException {
-    try {
+  private void updateOrSaveTenant(TenantReqDTO tenantReqDTO) throws IOException {
       boolean isCreate = tenantReqDTO.getTenantId() == null;
       Tenant tbTenant;
       if (isCreate) {
@@ -276,9 +276,6 @@ public class TkAdminController extends BaseController {
           tbTenant.getId(),
           isCreate ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
       tenantReqDTO.setTenantId(tbTenant.getTenantId().toString());
-    } catch (Exception e) {
-      throw handleException(e);
-    }
   }
 
   private void deleteTenant(String strTenantId) throws ThingsboardException {

@@ -147,7 +147,6 @@ public class TkDeviceController extends BaseController {
     tbClusterService.onDeviceUpdated(savedDevice, oldDevice);
     DeviceId tbDeviceId = savedDevice.getId();
     DeviceCredentials deviceCredentials = null;
-    try {
       logEntityAction(
           getCurrentUser(),
           savedDevice.getId(),
@@ -185,17 +184,6 @@ public class TkDeviceController extends BaseController {
             null,
             deviceCredentials);
       }
-    } catch (Exception e) {
-      logEntityAction(
-          emptyId(EntityType.DEVICE),
-          null,
-          null,
-          ActionType.CREDENTIALS_UPDATED,
-          e,
-          deviceCredentials);
-      deleteTbDevice(tbDeviceId.getId().toString());
-      throw handleException(e);
-    }
     return tbDeviceId;
   }
 

@@ -103,6 +103,7 @@ public enum ErrorMessage {
   DEVICE_IDENTIFIER_REPEATED(400079,"设备地址码或标识码【%s】与设备【%s】重复"),
   CURRENT_DATA_IN_USE(400080,"当前数据正在被【%s】使用,不能被禁用"),
   REPORT_NAME_ERROR(400081,"报表配置的名称包含斜杠或反斜杠!!!"),
+  DEVICE_CREDENTIALS_ASSIGNED(400082,"设备凭证【%s】已分配给其它设备!"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.dao.device.DeviceCredentialsDao;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
@@ -41,7 +42,8 @@ public class DeviceCredentialsDataValidator extends DataValidator<DeviceCredenti
             throw new DeviceCredentialsValidationException("Credentials for this device are already specified!");
         }
         if (deviceCredentialsDao.findByCredentialsId(tenantId, deviceCredentials.getCredentialsId()) != null) {
-            throw new DeviceCredentialsValidationException("Device credentials are already assigned to another device!");
+            throw new DeviceCredentialsValidationException(
+                    String.format(ErrorMessage.DEVICE_CREDENTIALS_ASSIGNED.getMessage(),deviceCredentials.getCredentialsValue()==null?deviceCredentials.getCredentialsId():deviceCredentials.getCredentialsValue()));
         }
     }
 
@@ -52,7 +54,8 @@ public class DeviceCredentialsDataValidator extends DataValidator<DeviceCredenti
         }
         DeviceCredentials existingCredentials = deviceCredentialsDao.findByCredentialsId(tenantId, deviceCredentials.getCredentialsId());
         if (existingCredentials != null && !existingCredentials.getId().equals(deviceCredentials.getId())) {
-            throw new DeviceCredentialsValidationException("Device credentials are already assigned to another device!");
+      throw new DeviceCredentialsValidationException(
+          String.format(ErrorMessage.DEVICE_CREDENTIALS_ASSIGNED.getMessage(),deviceCredentials.getCredentialsValue()==null?deviceCredentials.getCredentialsId():deviceCredentials.getCredentialsValue()));
         }
     }