...
|
...
|
@@ -21,12 +21,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode; |
21
|
21
|
import com.google.common.util.concurrent.FutureCallback;
|
22
|
22
|
import com.google.common.util.concurrent.Futures;
|
23
|
23
|
import com.google.common.util.concurrent.ListenableFuture;
|
24
|
|
-import io.grpc.stub.StreamObserver;
|
25
|
24
|
import lombok.extern.slf4j.Slf4j;
|
26
|
25
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
27
|
26
|
import org.springframework.beans.factory.annotation.Autowired;
|
28
|
27
|
import org.springframework.stereotype.Service;
|
29
|
|
-import org.thingsboard.server.common.data.Dashboard;
|
30
|
28
|
import org.thingsboard.server.common.data.DashboardInfo;
|
31
|
29
|
import org.thingsboard.server.common.data.DataConstants;
|
32
|
30
|
import org.thingsboard.server.common.data.Device;
|
...
|
...
|
@@ -56,51 +54,23 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery; |
56
|
54
|
import org.thingsboard.server.common.data.relation.EntitySearchDirection;
|
57
|
55
|
import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
|
58
|
56
|
import org.thingsboard.server.common.data.rule.RuleChain;
|
59
|
|
-import org.thingsboard.server.common.data.rule.RuleChainMetaData;
|
60
|
|
-import org.thingsboard.server.common.data.security.DeviceCredentials;
|
61
|
|
-import org.thingsboard.server.common.data.security.UserCredentials;
|
62
|
|
-import org.thingsboard.server.common.transport.util.JsonUtils;
|
63
|
57
|
import org.thingsboard.server.dao.asset.AssetService;
|
64
|
58
|
import org.thingsboard.server.dao.attributes.AttributesService;
|
65
|
59
|
import org.thingsboard.server.dao.dashboard.DashboardService;
|
66
|
|
-import org.thingsboard.server.dao.device.DeviceCredentialsService;
|
67
|
60
|
import org.thingsboard.server.dao.device.DeviceService;
|
68
|
61
|
import org.thingsboard.server.dao.edge.EdgeEventService;
|
69
|
62
|
import org.thingsboard.server.dao.entityview.EntityViewService;
|
70
|
63
|
import org.thingsboard.server.dao.relation.RelationService;
|
71
|
64
|
import org.thingsboard.server.dao.rule.RuleChainService;
|
72
|
65
|
import org.thingsboard.server.dao.user.UserService;
|
73
|
|
-import org.thingsboard.server.gen.edge.AssetUpdateMsg;
|
74
|
66
|
import org.thingsboard.server.gen.edge.AttributesRequestMsg;
|
75
|
|
-import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
|
76
|
67
|
import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
|
77
|
|
-import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
|
78
|
|
-import org.thingsboard.server.gen.edge.DownlinkMsg;
|
79
|
|
-import org.thingsboard.server.gen.edge.EntityDataProto;
|
80
|
|
-import org.thingsboard.server.gen.edge.EntityUpdateMsg;
|
81
|
|
-import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
|
82
|
68
|
import org.thingsboard.server.gen.edge.RelationRequestMsg;
|
83
|
|
-import org.thingsboard.server.gen.edge.RelationUpdateMsg;
|
84
|
|
-import org.thingsboard.server.gen.edge.ResponseMsg;
|
85
|
69
|
import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
|
86
|
|
-import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
|
87
|
|
-import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
|
88
|
|
-import org.thingsboard.server.gen.edge.UpdateMsgType;
|
89
|
70
|
import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
|
90
|
|
-import org.thingsboard.server.gen.edge.UserUpdateMsg;
|
91
|
|
-import org.thingsboard.server.service.edge.EdgeNotificationService;
|
92
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.AssetUpdateMsgConstructor;
|
93
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.DashboardUpdateMsgConstructor;
|
94
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.DeviceUpdateMsgConstructor;
|
95
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.EntityDataMsgConstructor;
|
96
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.EntityViewUpdateMsgConstructor;
|
97
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.RelationUpdateMsgConstructor;
|
98
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.RuleChainUpdateMsgConstructor;
|
99
|
|
-import org.thingsboard.server.service.edge.rpc.constructor.UserUpdateMsgConstructor;
|
100
|
71
|
import org.thingsboard.server.service.executors.DbCallbackExecutorService;
|
101
|
72
|
|
102
|
73
|
import java.util.ArrayList;
|
103
|
|
-import java.util.Collections;
|
104
|
74
|
import java.util.List;
|
105
|
75
|
import java.util.UUID;
|
106
|
76
|
|
...
|
...
|
@@ -126,9 +96,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { |
126
|
96
|
private DeviceService deviceService;
|
127
|
97
|
|
128
|
98
|
@Autowired
|
129
|
|
- private DeviceCredentialsService deviceCredentialsService;
|
130
|
|
-
|
131
|
|
- @Autowired
|
132
|
99
|
private AssetService assetService;
|
133
|
100
|
|
134
|
101
|
@Autowired
|
...
|
...
|
@@ -141,18 +108,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { |
141
|
108
|
private UserService userService;
|
142
|
109
|
|
143
|
110
|
@Autowired
|
144
|
|
- private DeviceUpdateMsgConstructor deviceUpdateMsgConstructor;
|
145
|
|
-
|
146
|
|
- @Autowired
|
147
|
|
- private UserUpdateMsgConstructor userUpdateMsgConstructor;
|
148
|
|
-
|
149
|
|
- @Autowired
|
150
|
|
- private RelationUpdateMsgConstructor relationUpdateMsgConstructor;
|
151
|
|
-
|
152
|
|
- @Autowired
|
153
|
|
- private EntityDataMsgConstructor entityDataMsgConstructor;
|
154
|
|
-
|
155
|
|
- @Autowired
|
156
|
111
|
private DbCallbackExecutorService dbCallbackExecutorService;
|
157
|
112
|
|
158
|
113
|
@Override
|
...
|
...
|
|