Merge branch '20230418' into 'master_dev'

refactor: 优化网关子设备不存在的业务逻辑

See merge request yunteng/thingskit!178

@@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.StringUtils;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
@@ -206,7 +207,13 @@ public class TcpGatewaySessionHandler {
                     new TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse>() {
                         @Override
                         public void onSuccess(GetOrCreateDeviceFromGatewayResponse msg) {
-                            TcpGatewayDeviceSessionCtx deviceSessionCtx = new TcpGatewayDeviceSessionCtx(context, TcpGatewaySessionHandler.this, msg.getDeviceInfo(), msg.getDeviceProfile(), transportService);
+                            TransportDeviceInfo deviceInfo = msg.getDeviceInfo();
+                            DeviceProfile deviceProfile = msg.getDeviceProfile();
+                            if(deviceInfo == null || deviceProfile == null){
+                                deviceFutures.remove(deviceName);
+                                return;
+                            }
+                            TcpGatewayDeviceSessionCtx deviceSessionCtx = new TcpGatewayDeviceSessionCtx(context, TcpGatewaySessionHandler.this, deviceInfo, deviceProfile, transportService);
                             if (devices.putIfAbsent(deviceName, deviceSessionCtx) == null) {
                                 log.trace("[{}] First got or created device [{}], type [{}] for the gateway session", sessionId, deviceName, deviceType);
                                 SessionInfoProto deviceSessionInfo = deviceSessionCtx.getSessionInfo();

@@ -192,8 +192,8 @@ public class TkDeviceScriptServiceImpl
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-            .eq(TkDeviceScriptEntity::getId, id);
+            .eq(TkDeviceScriptEntity::getId, id).and(a -> a
+                        .eq(TkDeviceScriptEntity::getTenantId, tenantId).or(b->b.eq(TkDeviceScriptEntity::getTenantId,EntityId.NULL_UUID.toString())));
     TkDeviceScriptEntity profile = baseMapper.selectOne(queryWrapper);
     return Optional.ofNullable(profile)
         .map(
@@ -250,8 +250,9 @@ public class TkDeviceScriptServiceImpl
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-                .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType).and(s->s
-                        .eq(TkDeviceScriptEntity::getTenantId, tenantId).or(r->r.eq(TkDeviceScriptEntity::getTenantId, EntityId.NULL_UUID.toString())));
+                .eq(TkDeviceScriptEntity::getStatus,1)
+                .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType)
+                .and(s->s.eq(TkDeviceScriptEntity::getTenantId, tenantId).or(r->r.eq(TkDeviceScriptEntity::getTenantId, EntityId.NULL_UUID.toString())));
     return baseMapper.selectList(queryWrapper).stream()
         .map(item -> item.getDTO(TkDeviceScriptDTO.class))
         .collect(Collectors.toList());