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

Code review changes

Browse Source
This commit is contained in:
Volodymyr Babak 2023-03-03 10:24:54 +02:00
parent c2b1a948da
commit 3dacb805db
6 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View File

@ -65,7 +65,6 @@ import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfi
import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.alarm.AlarmDao; import org.thingsboard.server.dao.alarm.AlarmDao;
import org.thingsboard.server.dao.audit.AuditLogDao; import org.thingsboard.server.dao.audit.AuditLogDao;
import org.thingsboard.server.dao.dashboard.DashboardService;
import org.thingsboard.server.dao.edge.EdgeEventDao; import org.thingsboard.server.dao.edge.EdgeEventDao;
import org.thingsboard.server.dao.entity.EntityService; import org.thingsboard.server.dao.entity.EntityService;
import org.thingsboard.server.dao.entityview.EntityViewService; import org.thingsboard.server.dao.entityview.EntityViewService;
@ -111,9 +110,6 @@ public class DefaultDataUpdateService implements DataUpdateService {
@Autowired @Autowired
private EntityViewService entityViewService; private EntityViewService entityViewService;
@Autowired
private DashboardService dashboardService;
@Autowired @Autowired
private TimeseriesService tsService; private TimeseriesService tsService;
@ -684,4 +680,5 @@ public class DefaultDataUpdateService implements DataUpdateService {
return Boolean.parseBoolean(env); return Boolean.parseBoolean(env);
} }
} }
} }

1
common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
View File

@ -69,4 +69,5 @@ public interface DashboardService extends EntityDaoService {
DashboardInfo findFirstDashboardInfoByTenantIdAndName(TenantId tenantId, String name); DashboardInfo findFirstDashboardInfoByTenantIdAndName(TenantId tenantId, String name);
List<Dashboard> findTenantDashboardsByTitle(TenantId tenantId, String title); List<Dashboard> findTenantDashboardsByTitle(TenantId tenantId, String title);
} }

6
common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
View File

@ -15,11 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import org.thingsboard.server.common.data.query.EntityFilterType;
import java.util.Arrays;
import java.util.List;
/** /**
* @author Andrew Shvayka * @author Andrew Shvayka
*/ */
@ -130,4 +125,5 @@ public class DataConstants {
public static final String HP_QUEUE_TOPIC = "tb_rule_engine.hp"; public static final String HP_QUEUE_TOPIC = "tb_rule_engine.hp";
public static final String SQ_QUEUE_NAME = "SequentialByOriginator"; public static final String SQ_QUEUE_NAME = "SequentialByOriginator";
public static final String SQ_QUEUE_TOPIC = "tb_rule_engine.sq"; public static final String SQ_QUEUE_TOPIC = "tb_rule_engine.sq";
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilterType.java
View File

@ -15,8 +15,6 @@
*/ */
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.Getter;
public enum EntityFilterType { public enum EntityFilterType {
SINGLE_ENTITY("singleEntity"), SINGLE_ENTITY("singleEntity"),
ENTITY_LIST("entityList"), ENTITY_LIST("entityList"),
@ -33,7 +31,6 @@ public enum EntityFilterType {
EDGE_SEARCH_QUERY("edgeSearchQuery"), EDGE_SEARCH_QUERY("edgeSearchQuery"),
API_USAGE_STATE("apiUsageState"); API_USAGE_STATE("apiUsageState");
@Getter
private final String label; private final String label;
EntityFilterType(String label) { EntityFilterType(String label) {

6
dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View File

@ -15,20 +15,15 @@
*/ */
package org.thingsboard.server.dao.dashboard; package org.thingsboard.server.dao.dashboard;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.ConstraintViolationException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.Dashboard;
import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.DashboardInfo;
import org.thingsboard.server.common.data.DataConstants;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.edge.Edge;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
@ -301,6 +296,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
public List<Dashboard> findTenantDashboardsByTitle(TenantId tenantId, String title) { public List<Dashboard> findTenantDashboardsByTitle(TenantId tenantId, String title) {
return dashboardDao.findByTenantIdAndTitle(tenantId.getId(), title); return dashboardDao.findByTenantIdAndTitle(tenantId.getId(), title);
} }
private PaginatedRemover<TenantId, DashboardInfo> tenantDashboardsRemover = private PaginatedRemover<TenantId, DashboardInfo> tenantDashboardsRemover =
new PaginatedRemover<TenantId, DashboardInfo>() { new PaginatedRemover<TenantId, DashboardInfo>() {

1
dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java
View File

@ -71,4 +71,5 @@ public interface DashboardInfoRepository extends JpaRepository<DashboardInfoEnti
@Param("edgeId") UUID edgeId, @Param("edgeId") UUID edgeId,
@Param("searchText") String searchText, @Param("searchText") String searchText,
Pageable pageable); Pageable pageable);
} }