Merge branch '20200307' into 'master'

fix: 网关子设备与网关设备的关联关系管理

See merge request huang/thingsboard3.3.2!59

@@ -50,6 +50,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -66,7 +67,7 @@ public class YtDeviceController extends BaseController {
   @ApiOperation("创建|编辑")
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   public ResponseEntity<DeviceDTO> saveDevice(
-      @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO) throws ThingsboardException {
+      @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO) throws ThingsboardException, ExecutionException, InterruptedException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
     boolean enable = deviceService.validateFormdata(currentTenantId, deviceDTO);
     if (!enable) {
@@ -74,86 +75,85 @@ public class YtDeviceController extends BaseController {
     }
     DeviceDTO newDeviceDTO = null;
     boolean isIncludeRelation = false;
-    String gateWayDeviceId = deviceDTO.getGatewayId();
+
+    String gatewayId = deviceDTO.getGatewayId();
     DeviceDTO gateWayDevice = null;
-    if (StringUtils.isNotEmpty(gateWayDeviceId)) {
+    if (StringUtils.isNotEmpty(gatewayId)) {
       gateWayDevice =
           deviceService.checkDeviceByTenantIdAndDeviceId(
-              getCurrentUser().getCurrentTenantId(), gateWayDeviceId);
-    }
-    if (deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
-        && StringUtils.isNotEmpty(gateWayDeviceId)
-        && null == deviceDTO.getId()) {
+              getCurrentUser().getCurrentTenantId(), gatewayId);
+
       // 第一步判断该网关设备是否存在于该租户下面
       if (null == gateWayDevice) {
         throw new YtDataValidationException(
-            ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
+                ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
       }
-      try {
-        // 第二步判断网关的关联设备是否已包含该设备
-        EntityId entityId = EntityIdFactory.getByTypeAndId("DEVICE", gateWayDevice.getTbDeviceId());
+    }
+
+    /**子设备编辑时，TB中已经存在关联关系则值更新设备表信息*/
+    String  selfTbDeviceIdStr  = deviceDTO.getTbDeviceId();
+    if (selfTbDeviceIdStr != null
+            && deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
+            && StringUtils.isNotEmpty(gatewayId)) {
+
+
+        // 第二步判断网关子设备是否已关联到网关设备
+        EntityId entityId = EntityIdFactory.getByTypeAndId("DEVICE", selfTbDeviceIdStr);//gateWayDevice.getTbDeviceId()
         List<EntityRelationInfo> list =
             relationService.findInfoByTo(getTenantId(), entityId, RelationTypeGroup.COMMON).get();
-        int count = 0;
-        int exit = 0;
+
         for (EntityRelationInfo entityRelationInfo : list) {
-          count++;
-          if (entityRelationInfo.getToName().equals(deviceDTO.getName())) {
-            exit = count;
+          if (entityRelationInfo.getTo().getId().equals(selfTbDeviceIdStr)
+                  && entityRelationInfo.getFrom().getId().equals(gatewayId)) {
+            deviceDTO.setTbDeviceId(entityRelationInfo.getTo().toString());
+            newDeviceDTO =
+                    deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
+            isIncludeRelation = true;
             break;
           }
         }
-        // 第三步如果包含，只需创建我方设备，不需调用TB创建设备,不包含，走正常逻辑，然后将关联关系创建
-        if (count > 0) {
-          EntityRelationInfo entityRelationInfo = list.get(exit);
-          deviceDTO.setTbDeviceId(entityRelationInfo.getTo().toString());
-          newDeviceDTO =
-              deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
-          isIncludeRelation = true;
-        }
-      } catch (Exception e) {
-        handleException(e);
-      }
     }
+
+
+    /**需要更新设备表和关联关系表*/
     if (!isIncludeRelation) {
       Device tbDevice = buildTbDeviceFromDeviceDTO(getCurrentUser().getTenantId(), deviceDTO);
 
-      DeviceId tbDeviceId = updateTbDevice(tbDevice, deviceDTO.getDeviceToken());
-      String deviceId = tbDeviceId.getId().toString();
-      deviceDTO.setTbDeviceId(deviceId);
+      DeviceId selfTbId = updateTbDevice(tbDevice, deviceDTO.getDeviceToken());
+      selfTbDeviceIdStr = selfTbId.getId().toString();
+      deviceDTO.setTbDeviceId( selfTbDeviceIdStr);
       newDeviceDTO = deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
+
       if (deviceDTO.getDeviceType().equals(DeviceTypeEnum.SENSOR)
-          && StringUtils.isNotEmpty(gateWayDeviceId)
-          && gateWayDevice != null) {
-        if (null != deviceDTO.getId()) {
-          // 删除原來的关联关系
-          List<DeviceDTO> list =
-              deviceService.findGateWayDeviceByTbDeviceId(
-                  getCurrentUser().getCurrentTenantId(), deviceId);
-          if (null == list || list.size() < 1) {
-            throw new YtDataValidationException(ErrorMessage.DEVICE_RELATION_IS_ABSENT.getMessage());
-          }
+          && StringUtils.isNotEmpty(selfTbDeviceIdStr)) {
+        // 删除原來的关联关系
+        List<DeviceDTO> list =
+                deviceService.findGateWayDeviceByTbDeviceId(
+                        getCurrentUser().getCurrentTenantId(),  selfTbDeviceIdStr);
+        if (null != list && list.size() > 0) {
           DeviceId form = new DeviceId(UUID.fromString(list.get(0).getTbDeviceId()));
-          DeviceId to = new DeviceId(UUID.fromString(deviceId));
           EntityRelation relation =
-              new EntityRelation(
-                  form, to, FastIotConstants.Relation.relationType, RelationTypeGroup.COMMON);
+                  new EntityRelation(
+                          form, selfTbId, FastIotConstants.Relation.relationType, RelationTypeGroup.COMMON);
           boolean found =
-              relationService.deleteRelation(
-                  getTenantId(),
-                  form,
-                  to,
-                  FastIotConstants.Relation.relationType,
-                  RelationTypeGroup.COMMON);
+                  relationService.deleteRelation(
+                          getTenantId(),
+                          form,
+                          selfTbId,
+                          FastIotConstants.Relation.relationType,
+                          RelationTypeGroup.COMMON);
 
           if (!found) {
             throw new ThingsboardException(
-                "Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND);
+                    "Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND);
           }
           sendRelationNotificationMsg(
-              getTenantId(), relation, EdgeEventActionType.RELATION_DELETED);
+                  getTenantId(), relation, EdgeEventActionType.RELATION_DELETED);
+        }
+
+        if(gateWayDevice != null){
+          addRelation(getTenantId(), gateWayDevice.getTbDeviceId(),  selfTbDeviceIdStr);
         }
-        addRelation(getTenantId(), gateWayDevice.getTbDeviceId(), deviceId);
       }
     }
     return ResponseEntity.ok(newDeviceDTO);

@@ -83,7 +83,7 @@ class ReactState {
         }
 
 
-        if(matched && conditions != null ){
+        if(matched && conditions.size() >0 ){
             matched = false;
             for(DoCondition item:conditions){
                 TriggerState conditionState = getOrCreateConditionState(item.getEntityId(),item.getTriggerCondition());