Merge branch '20230426' into 'master_dev'

20230426

See merge request yunteng/thingskit!184

@@ -291,21 +291,25 @@ public class DefaultTransportApiService implements TransportApiService {
             Lock deviceCreationLock = deviceCreationLocks.computeIfAbsent(requestMsg.getDeviceName(), id -> new ReentrantLock());
             deviceCreationLock.lock();
             try {
-                Device device = deviceService.findDeviceByTenantIdAndName(gateway.getTenantId(), requestMsg.getDeviceName());
 
-                if (device == null) {
-
-
-
-                    //Thingskit function
-                    if(gateway.getDeviceData().getTransportConfiguration().getType() == DeviceTransportType.TCP) {
+                //Thingskit function
+                String slaveName = requestMsg.getDeviceName();
+                if(gateway.getDeviceData().getTransportConfiguration().getType() == DeviceTransportType.TCP) {
+                    DeviceDTO iotDev = ytDeviceService.findSlaveDevice(gateway.getTenantId().getId().toString()
+                            , gateway.getId().getId().toString()
+                            ,slaveName);
+                    if(iotDev == null ){
                         GetOrCreateDeviceFromGatewayResponseMsg.Builder builder = GetOrCreateDeviceFromGatewayResponseMsg.newBuilder();
                         return TransportApiResponseMsg.newBuilder()
                                 .setGetOrCreateDeviceResponseMsg(builder.build())
                                 .build();
-                    }
+                        }
+                        slaveName = iotDev.getName();
+                }
 
+                Device device = deviceService.findDeviceByTenantIdAndName(gateway.getTenantId(), slaveName);
 
+                if (device == null) {
                     TenantId tenantId = gateway.getTenantId();
                     device = new Device();
                     device.setTenantId(tenantId);

@@ -535,7 +535,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
      * @return
      */
     private ChannelFuture pushDeviceMsg(ChannelHandlerContext ctx, String message) {
-        byte[] payloadInBytes = ByteUtils.strToBytes(message);
+        byte[] payloadInBytes = ByteUtils.strToBytes(StringUtils.isEmpty(message)?"":message);
         ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
 
         return ctx.writeAndFlush(payload);

@@ -68,7 +68,7 @@
     </resultMap>
 
     <sql id="basicColumns">
-        ifd.id,ifd.gateway_id
+        ifd.id,ifd.gateway_id,ifd.code
         ,ifd.sn,ifd.brand,ifd.name,ifd.alias,ifd.device_info,ifd.profile_id,ifd.device_profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd.alarm_status