fix: [DEFECT-847] validator DeviceCredentials failed with delete TBDevice

@@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -36,9 +37,9 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
@@ -55,10 +56,10 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"设备管理"})
 @Slf4j
 public class TkDeviceController extends BaseController {
-  private final TkDeviceService deviceService;
-  private final DeviceService tbDeviceService;
+  private final TkDeviceService tkdeviceService;
   private final ObjectMapper objectMapper;
   private final TkDeviceProfileService ytDeviceProfileService;
+  private final GatewayNotificationsService gatewayNotificationsService;
 
   @PostMapping
   @ApiOperation("创建|编辑")
@@ -68,14 +69,14 @@ public class TkDeviceController extends BaseController {
       @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO)
       throws ThingsboardException, ExecutionException, InterruptedException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    deviceService.validateFormData(currentTenantId, deviceDTO);
+    tkdeviceService.validateFormData(currentTenantId, deviceDTO);
 
     /** 网关是否有效 */
     String gatewayId = deviceDTO.getGatewayId();
     DeviceDTO gateWay = null;
     if (StringUtils.isNotEmpty(gatewayId)) {
       gateWay =
-          deviceService.checkDeviceByTenantIdAndDeviceId(
+          tkdeviceService.checkDeviceByTenantIdAndDeviceId(
               getCurrentUser().getCurrentTenantId(), gatewayId);
       if (null == gateWay) {
         throw new YtDataValidationException(
@@ -120,14 +121,14 @@ public class TkDeviceController extends BaseController {
     }
 
     DeviceDTO newDeviceDTO =
-        deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
+        tkdeviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
     return ResponseEntity.ok(newDeviceDTO);
   }
 
   @GetMapping({"sn"})
   @ApiOperation("自动生成设备SN")
   public ResponseEntity<String> generate() {
-    String result = deviceService.generateSn();
+    String result = tkdeviceService.generateSn();
     return ResponseEntity.ok(result);
   }
 
@@ -141,9 +142,10 @@ public class TkDeviceController extends BaseController {
       checkEntity(null, tbDevice, Resource.DEVICE);
     }
 
-    Device savedDevice = checkNotNull(tbDeviceService.saveDeviceWithAccessToken(tbDevice, null));
+    Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(tbDevice, null));
     tbClusterService.onDeviceUpdated(savedDevice, oldDevice);
     DeviceId tbDeviceId = savedDevice.getId();
+    DeviceCredentials deviceCredentials = null;
     try {
       logEntityAction(
           getCurrentUser(),
@@ -154,7 +156,7 @@ public class TkDeviceController extends BaseController {
           null);
 
       if (formCredentials != null && formCredentials.getCredentialsType() != null) {
-        DeviceCredentials deviceCredentials =
+        deviceCredentials =
             checkNotNull(
                 deviceCredentialsService.findDeviceCredentialsByDeviceId(
                     getCurrentUser().getTenantId(), tbDeviceId));
@@ -182,8 +184,16 @@ public class TkDeviceController extends BaseController {
             null,
             deviceCredentials);
       }
-    } catch (ThingsboardException e) {
-      log.error("Failed to log entity action", e);
+    } catch (Exception e) {
+      logEntityAction(
+          emptyId(EntityType.DEVICE),
+          null,
+          null,
+          ActionType.CREDENTIALS_UPDATED,
+          e,
+          deviceCredentials);
+      deleteTbDevice(tbDeviceId.getId().toString());
+      throw handleException(e);
     }
     return tbDeviceId;
   }
@@ -193,7 +203,7 @@ public class TkDeviceController extends BaseController {
   @PreAuthorize("@check.checkPermissions({},{'api:yt:device:get'})")
   public ResponseEntity<DeviceDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
-    return ResponseEntity.of(deviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
+    return ResponseEntity.of(tkdeviceService.getDevice(getCurrentUser().getCurrentTenantId(), id));
   }
 
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
@@ -238,7 +248,7 @@ public class TkDeviceController extends BaseController {
     if (getCurrentUser().isCustomerUser()) {
       queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
     }
-    return deviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
+    return tkdeviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
 
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
@@ -276,7 +286,7 @@ public class TkDeviceController extends BaseController {
     if (getCurrentUser().isCustomerUser()) {
       queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
     }
-    return deviceService.pageRelation(queryMap);
+    return tkdeviceService.pageRelation(queryMap);
   }
 
   @PostMapping("/import")
@@ -301,20 +311,23 @@ public class TkDeviceController extends BaseController {
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    List<String> tdIds = deviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
+    List<String> tdIds = tkdeviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
     for (String id : tdIds) {
       deleteTbDevice(id);
     }
-    deviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
+    tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
   }
 
   private void deleteTbDevice(String id) throws ThingsboardException {
     DeviceId deviceId = new DeviceId(toUUID(id));
+
     Device device = checkDeviceId(deviceId, Operation.DELETE);
 
     List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), deviceId);
 
-    tbDeviceService.deleteDevice(getCurrentUser().getTenantId(), deviceId);
+    deviceService.deleteDevice(getCurrentUser().getTenantId(), deviceId);
+
+    gatewayNotificationsService.onDeviceDeleted(device);
 
     tbClusterService.onDeviceDeleted(device, null);
 
@@ -333,7 +346,7 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
           String deviceLabel)
       throws ThingsboardException {
-    return deviceService.findDevicesByDeviceTypeAndOrganizationId(
+    return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
   }
 
@@ -348,7 +361,7 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
           String deviceLabel)
       throws ThingsboardException {
-    return deviceService.findDevicesByDeviceTypeAndOrganizationId(
+    return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
   }
 
@@ -358,12 +371,13 @@ public class TkDeviceController extends BaseController {
   public List<SelectItemDTO> getMasterDevices(
       @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId,
       @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
-              String deviceProfileId)
+          String deviceProfileId)
       throws ThingsboardException {
-    return deviceService.findMasterDevices(
+    return tkdeviceService.findMasterDevices(
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().isCustomerUser() ? getCurrentUser().getCustomerId().toString() : null,
-        organizationId,deviceProfileId);
+        organizationId,
+        deviceProfileId);
   }
 
   @GetMapping("/list/slave/{organizationId}")
@@ -374,7 +388,7 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "主设备ID") @RequestParam(value = "masterId", required = false)
           String masterId)
       throws ThingsboardException {
-    return deviceService.findSlaveDevices(
+    return tkdeviceService.findSlaveDevices(
         masterId,
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().isCustomerUser() ? getCurrentUser().getCustomerId().toString() : null,
@@ -389,7 +403,7 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备ID") @RequestParam(value = "deviceIds", required = false)
           List<String> deviceIds)
       throws ThingsboardException {
-    return deviceService.findDeviceKeys(
+    return tkdeviceService.findDeviceKeys(
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().isCustomerUser() ? getCurrentUser().getCustomerId().toString() : null,
         organizationId,
@@ -402,7 +416,7 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "tb设备Id") @PathVariable("tbDeviceId") String tbDeviceId)
       throws ThingsboardException {
     List<DeviceDTO> list =
-        deviceService.findGateWayDeviceByTbDeviceId(
+        tkdeviceService.findGateWayDeviceByTbDeviceId(
             getCurrentUser().getCurrentTenantId(), tbDeviceId);
     return null != list && list.size() > FastIotConstants.MagicNumber.ZERO
         ? list.get(FastIotConstants.MagicNumber.ZERO)
@@ -414,7 +428,7 @@ public class TkDeviceController extends BaseController {
   public DeviceDTO getSubsetDeviceByTbDeviceId(
       @ApiParam(value = "tb设备Id") @PathVariable("tbDeviceId") String tbDeviceId)
       throws ThingsboardException {
-    return deviceService.getSubsetDeviceByTbDeviceId(
+    return tkdeviceService.getSubsetDeviceByTbDeviceId(
         getCurrentUser().getCurrentTenantId(), tbDeviceId);
   }
 
@@ -481,7 +495,7 @@ public class TkDeviceController extends BaseController {
   @ApiOperation("设备是否被占用")
   public ResponseResult<Boolean> otherUsing(@PathVariable("id") String deviceId)
       throws ThingsboardException {
-    String str = deviceService.otherUsing(deviceId, getCurrentUser().getCurrentTenantId());
+    String str = tkdeviceService.otherUsing(deviceId, getCurrentUser().getCurrentTenantId());
     ResponseResult result = ResponseResult.success(StringUtils.isEmpty(str) ? true : false);
     result.setMessage(str);
     return result;
@@ -498,6 +512,7 @@ public class TkDeviceController extends BaseController {
     if (null == dto) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    return ResponseEntity.ok(deviceService.getDeviceAttributes(deviceProfileId, tenantId,dataType));
+    return ResponseEntity.ok(
+        tkdeviceService.getDeviceAttributes(deviceProfileId, tenantId, dataType));
   }
 }