refactor: TCP会话信息调整

-package org.thingsboard.server.transport.tcp.session;
+package org.thingsboard.server.transport.tcp.adaptors;
 
-import io.netty.handler.codec.mqtt.MqttMessageType;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
-public class TCPMessage implements Serializable {
+public class TcpUpEntry implements Serializable {
 
     /**消息ID，用于请求与响应的匹配，例如：modbus由地址码和功能码组成。*/
     private String requestId;
@@ -14,15 +13,18 @@ public class TCPMessage implements Serializable {
 
     private String message;
 
-    /**数据主题，例如：modbus的功能码等。*/
+    /**数据主题，例如：协议的功能码等。*/
     private String topic;
 
     /**设备地址码，例如：modbus的地址吗*/
     private String deviceCode;
 
+    /**从设备(网关子设备)唯一标识符*/
+    private String slaveCode;
 
 
-    public TCPMessage(String message){
+
+    public TcpUpEntry(String message){
         this.message = message;
     }
 

@@ -21,6 +21,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
+import org.thingsboard.server.transport.tcp.adaptors.TcpUpEntry;
 
 import java.util.UUID;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -42,7 +43,7 @@ public class TcpDeviceSessionCtx extends TcpDeviceWareSessionContext {
 
     private final AtomicInteger msgIdSeq = new AtomicInteger(0);
 
-    private final ConcurrentLinkedQueue<TCPMessage> msgQueue = new ConcurrentLinkedQueue<>();
+    private final ConcurrentLinkedQueue<TcpUpEntry> msgQueue = new ConcurrentLinkedQueue<>();
 
     @Getter
     private final Lock msgQueueProcessorLock = new ReentrantLock();
@@ -73,17 +74,17 @@ public class TcpDeviceSessionCtx extends TcpDeviceWareSessionContext {
 
 
 
-    public void addToQueue(TCPMessage msg) {
+    public void addToQueue(TcpUpEntry msg) {
         msgQueueSize.incrementAndGet();
         ReferenceCountUtil.retain(msg);
         msgQueue.add(msg);
     }
 
-    public void tryProcessQueuedMsgs(Consumer<TCPMessage> msgProcessor) {
+    public void tryProcessQueuedMsgs(Consumer<TcpUpEntry> msgProcessor) {
         while (!msgQueue.isEmpty()) {
             if (msgQueueProcessorLock.tryLock()) {
                 try {
-                    TCPMessage msg;
+                    TcpUpEntry msg;
                     while ((msg = msgQueue.poll()) != null) {
                         try {
                             msgQueueSize.decrementAndGet();

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.thingsboard.server.transport.tcp.session;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,16 +8,13 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
-import org.thingsboard.server.transport.tcp.script.TkScriptFactory;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
 
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 
 /**
  * @author Andrew Shvayka
@@ -43,21 +25,14 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
     @Getter
     private final TcpTransportContext context;
 
-    private volatile String telemetryTopicFilter ;
-    private volatile String attributesTopicFilter;
-    private volatile String toDeviceRpcResponseTopicFilter;
-    @Getter
-    private volatile TcpDataTypeEnum payloadType = TcpDataTypeEnum.HEX;
-
-    private volatile TcpTransportAdaptor adaptor;
+    private volatile String authScriptId ;
+    private volatile String telemetryScriptId ;
+    private volatile String rpcScriptId;
 
     /**设备唯一标识符，例如：设备SN、设备地址码等。数据内携带标识符*/
     @Getter
-    private volatile String deviceCode = "55";
-
-
-    @Getter
-    private UUID scriptId;
+    private volatile String deviceCode;
+    private volatile TcpTransportAdaptor adaptor;
 
     public TcpDeviceWareSessionContext(UUID sessionId, TcpTransportContext context) {
         super(sessionId);
@@ -66,16 +41,7 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
     }
 
 
-    public boolean isDeviceTelemetryTopic(String topicName) {
-        return telemetryTopicFilter.equals(topicName);
-    }
 
-    public boolean isDeviceAttributesTopic(String topicName) {
-        return attributesTopicFilter.equals(topicName);
-    }
-    public boolean isToDeviceRpcResponseTopic(String topicName) {
-        return toDeviceRpcResponseTopicFilter.equals(topicName);
-    }
 
     public TcpTransportAdaptor getPayloadAdaptor() {
         return this.adaptor;
@@ -85,15 +51,7 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
     @Override
     public void setDeviceInfo(TransportDeviceInfo deviceInfo) {
         super.setDeviceInfo(deviceInfo);
-        try {
-            JsonNode additionalInfo =  context.getMapper().readTree(deviceInfo.getAdditionalInfo());
-            if(additionalInfo !=null && additionalInfo.has(FastIotConstants.TCP_DEVICE_IDENTIFY_FILED)){
-                deviceCode = additionalInfo.get(FastIotConstants.TCP_DEVICE_IDENTIFY_FILED).asText();
-            }
-        } catch (JsonProcessingException e) {
-            log.trace("[{}][{}] Failed to fetch device additional info", sessionId, deviceInfo.getDeviceName(), e);
-        }
-
+        deviceCode = deviceInfo.getDeviceName();
     }
 
     @Override
@@ -112,24 +70,9 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
 
         TkTcpDeviceProfileTransportConfiguration tcpConfiguration = (TkTcpDeviceProfileTransportConfiguration) transportConfiguration;
-        payloadType = tcpConfiguration.getDataFormat();
-        if (TcpDataTypeEnum.ASCII.equals(payloadType)) {
-            payloadType = TcpDataTypeEnum.ASCII;
-        } else {
-            payloadType = TcpDataTypeEnum.HEX;
-        }
-        this.attributesTopicFilter = tcpConfiguration.getAttributesTopic();
-        this.telemetryTopicFilter = tcpConfiguration.getTelemetryTopic();
-        this.toDeviceRpcResponseTopicFilter = tcpConfiguration.getRpcTopic();
-        String scriptBody = tcpConfiguration.getScriptText();
-        try {
-            this.scriptId = this.adaptor.getJsScriptEngineFunctionId(scriptBody==null? TkScriptFactory.INCLUD_ORIGINAL_DATA:scriptBody);
-        } catch (ExecutionException e) {
-            log.warn("设备配置【{}】的脚本【{}】解析异常",deviceProfile.getSearchText(),scriptBody);
-            throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        this.authScriptId = tcpConfiguration.getAuthScriptId();
+        this.telemetryScriptId = tcpConfiguration.getUpScriptId();
+        this.rpcScriptId = tcpConfiguration.getDownScriptId();
     }
 
 }