Commit 94addec69d72f2d9c435d57609bf0ea182404b7e
Committed by
Andrew Shvayka
1 parent
ab3c1192
added user to the create relation rule node
Showing
1 changed file
with
9 additions
and
0 deletions
@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.DashboardInfo; | @@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.DashboardInfo; | ||
35 | import org.thingsboard.server.common.data.Device; | 35 | import org.thingsboard.server.common.data.Device; |
36 | import org.thingsboard.server.common.data.EntityType; | 36 | import org.thingsboard.server.common.data.EntityType; |
37 | import org.thingsboard.server.common.data.EntityView; | 37 | import org.thingsboard.server.common.data.EntityView; |
38 | +import org.thingsboard.server.common.data.User; | ||
38 | import org.thingsboard.server.common.data.asset.Asset; | 39 | import org.thingsboard.server.common.data.asset.Asset; |
39 | import org.thingsboard.server.common.data.id.EntityId; | 40 | import org.thingsboard.server.common.data.id.EntityId; |
40 | import org.thingsboard.server.common.data.id.EntityIdFactory; | 41 | import org.thingsboard.server.common.data.id.EntityIdFactory; |
@@ -49,6 +50,7 @@ import org.thingsboard.server.dao.customer.CustomerService; | @@ -49,6 +50,7 @@ import org.thingsboard.server.dao.customer.CustomerService; | ||
49 | import org.thingsboard.server.dao.dashboard.DashboardService; | 50 | import org.thingsboard.server.dao.dashboard.DashboardService; |
50 | import org.thingsboard.server.dao.device.DeviceService; | 51 | import org.thingsboard.server.dao.device.DeviceService; |
51 | import org.thingsboard.server.dao.entityview.EntityViewService; | 52 | import org.thingsboard.server.dao.entityview.EntityViewService; |
53 | +import org.thingsboard.server.dao.user.UserService; | ||
52 | 54 | ||
53 | import java.util.List; | 55 | import java.util.List; |
54 | import java.util.Optional; | 56 | import java.util.Optional; |
@@ -245,6 +247,13 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA | @@ -245,6 +247,13 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA | ||
245 | } | 247 | } |
246 | } | 248 | } |
247 | break; | 249 | break; |
250 | + case USER: | ||
251 | + UserService userService = ctx.getUserService(); | ||
252 | + User user = userService.findUserByEmail(ctx.getTenantId(), entitykey.getEntityName()); | ||
253 | + if(user != null){ | ||
254 | + targetEntity.setEntityId(user.getId()); | ||
255 | + } | ||
256 | + break; | ||
248 | default: | 257 | default: |
249 | return targetEntity; | 258 | return targetEntity; |
250 | } | 259 | } |