Merge branch 'ljl1207' into 'master'

fix: 设备配置删除异常

See merge request huang/thingsboard3.3.2!12

@@ -151,10 +151,12 @@ public class YtDeviceProfileController extends BaseController {
     @DeleteMapping
     @ApiOperation("删除")
     public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
+        ytDeviceProfileService.deleteDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+
         for (String id : deleteDTO.getIds()) {
             deleteTbDeviceProfile(id);
         }
-        ytDeviceProfileService.deleteDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+
     }
 
     private void deleteTbDeviceProfile(String strDeviceProfileId) throws ThingsboardException {

@@ -23,14 +23,14 @@ public class YtDevice extends TenantBaseEntity {
   private JsonNode deviceInfo;
 
   private LocalDateTime activeTime;
-  private DeviceState deviceState;
+  private String deviceState;
   private String profileId;
   private String deviceToken;
   private String tbDeviceId;
   private String deviceTypeId;
   private LocalDateTime lastConnectTime;
   private String label;
-  private DeviceTypeEnum deviceType;
+  private String deviceType;
 //  private DeviceCredentialsEnum deviceCredentials;
   private String organizationId;
   /** 告警状态：0：正常 1：告警 */

@@ -139,17 +139,14 @@ public class YtDeviceProfileServiceImpl
         if (count > 0) {
             throw new YtDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
         }
-        // TODO check if ids bind to iotfs_key_value_mapping
-        List<UUID> deletedIds = new ArrayList<>();
+
         for (String id : ids) {
-            deletedIds.add(UUID.fromString(id));
             LambdaQueryWrapper filter = new QueryWrapper<AlarmProfile>()
                     .lambda()
                     .eq(AlarmProfile::getTenantId, tenantId)
                     .in(AlarmProfile::getDeviceProfileId, id);
             alarmProfileMapper.delete(filter);
         }
-        deviceProfileDao.removeAllByIds(deletedIds);
 
     }