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

fixed entity service regisrty test

Browse Source
This commit is contained in:
IrynaMatveieva 2025-04-25 11:16:05 +03:00 committed by ViacheslavKlimov
parent 290fba4819
commit 64f35d2d7b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/dao-api/src/main/java/org/thingsboard/server/dao/task/JobService.java
View File

@ -21,8 +21,9 @@ import org.thingsboard.server.common.data.job.Job;
import org.thingsboard.server.common.data.job.JobStats; import org.thingsboard.server.common.data.job.JobStats;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.entity.EntityDaoService;
public interface JobService { public interface JobService extends EntityDaoService {
Job createJob(TenantId tenantId, Job job); Job createJob(TenantId tenantId, Job job);

15
dao/src/main/java/org/thingsboard/server/dao/task/DefaultJobService.java
View File

@ -18,6 +18,9 @@ package org.thingsboard.server.dao.task;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.HasId;
import org.thingsboard.server.common.data.id.JobId; import org.thingsboard.server.common.data.id.JobId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.job.Job; import org.thingsboard.server.common.data.job.Job;
@ -31,6 +34,8 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DataValidationException;
import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.DataValidator;
import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
@ -113,4 +118,14 @@ public class DefaultJobService implements JobService {
} }
@Override
public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
return Optional.ofNullable(findJobById(tenantId, new JobId(entityId.getId())));
}
@Override
public EntityType getEntityType() {
return EntityType.JOB;
}
} }