Merge branch '20230425' into 'master_dev'

fix(DEFECT-1234): 给网关子设备下发RPC指令 See merge request yunteng/thingskit!183

Merge branch '20230425' into 'master_dev'
fix(DEFECT-1234): 给网关子设备下发RPC指令 See merge request yunteng/thingskit!183
xp.Huang
2 parents e7607b4c 39b75022
Showing 20 changed files with 320 additions and 143 deletions
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
common/cluster-api/src/main/proto/queue.proto
common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/id/ScriptId.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportContext.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/AbstractTkScriptInvokeService.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/TkScriptInvokeService.java
common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/yunteng/ScriptUpdatedEvent.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
dao/src/main/resources/mapper/DeviceMapper.xml
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @3612fa7
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @3612fa7
@@ -58,6 +58,7 @@ import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
 import org.thingsboard.server.common.msg.TbActorMsg;
@@ -242,20 +243,26 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     }
     private Rpc createRpc(ToDeviceRpcRequest request, RpcStatus status) {
+        //Thingskit function
+        JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
+        ObjectNode additional = (old == null || old.isEmpty()) ?mapper.createObjectNode():(ObjectNode)old;
+        if(!additional.has(ModelConstants.TablePropertyMapping.COMMAND_TYPE)){
+            additional.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.DIY.ordinal());
+        }
+        DeviceId saveDeviceId = deviceId;
+        if(additional.has(FastIotConstants.Rpc.TARGET_ID)){
+            saveDeviceId = new DeviceId(UUID.fromString(additional.get(FastIotConstants.Rpc.TARGET_ID).asText()));
+        }
+
         Rpc rpc = new Rpc(new RpcId(request.getId()));
         rpc.setCreatedTime(System.currentTimeMillis());
         rpc.setTenantId(tenantId);
-        rpc.setDeviceId(deviceId);
+        rpc.setDeviceId(saveDeviceId);
         rpc.setExpirationTime(request.getExpirationTime());
         rpc.setRequest(JacksonUtil.valueToTree(request));
         rpc.setStatus(status);
 		rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
-        //Thingskit function
-        JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
-        ObjectNode additional = (old == null || old.isEmpty()) ?mapper.createObjectNode():(ObjectNode)old;
-        if(!additional.has(ModelConstants.TablePropertyMapping.COMMAND_TYPE)){
-            additional.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.DIY.ordinal());
-        }
+
         rpc.setAdditionalInfo(additional);
         return systemContext.getTbRpcService().save(tenantId, rpc);
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @3612fa7
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
View file @3612fa7
@@ -16,7 +16,9 @@
 package org.thingsboard.server.controller;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,8 +37,14 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.rpc.RpcError;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rpc.LocalRequestMetaData;
 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
@@ -62,6 +70,10 @@ public abstract class AbstractRpcController extends BaseController {
     @Autowired
     protected AccessValidator accessValidator;
+
+    @Autowired
+    protected TkDeviceService tkDeviceService;
+
     @Value("${server.rest.server_side_rpc.min_timeout:5000}")
     protected long minTimeout;
@@ -79,14 +91,28 @@ public abstract class AbstractRpcController extends BaseController {
             long expTime = rpcRequestBody.has(DataConstants.EXPIRATION_TIME) ? rpcRequestBody.get(DataConstants.EXPIRATION_TIME).asLong() : System.currentTimeMillis() + Math.max(minTimeout, timeout);
             UUID rpcRequestUUID = rpcRequestBody.has("requestUUID") ? UUID.fromString(rpcRequestBody.get("requestUUID").asText()) : UUID.randomUUID();
             boolean persisted = rpcRequestBody.has(DataConstants.PERSISTENT) && rpcRequestBody.get(DataConstants.PERSISTENT).asBoolean();
-            String additionalInfo =  JacksonUtil.toString(rpcRequestBody.get(DataConstants.ADDITIONAL_INFO));
+
+
+            //Thingskit function
+            DeviceDTO tkDevice = tkDeviceService.findDeviceInfoByTbDeviceId(currentUser.getCurrentTenantId(), deviceId.getId().toString());
+            ObjectNode additional = (ObjectNode) rpcRequestBody.get(DataConstants.ADDITIONAL_INFO);
+            if(additional == null){
+                additional = JacksonUtil.newObjectNode();
+            }
+            if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){
+                additional.put(FastIotConstants.Rpc.TARGET_ID, deviceId.getId().toString());
+            }
+            DeviceId realDevice = DeviceTypeEnum.SENSOR == tkDevice.getDeviceType()?new DeviceId(UUID.fromString(tkDevice.getGatewayId())):deviceId;
+            String additionalInfo =  JacksonUtil.toString(additional);
+
             Integer retries = rpcRequestBody.has(DataConstants.RETRIES) ? rpcRequestBody.get(DataConstants.RETRIES).asInt() : null;
-            accessValidator.validate(currentUser, Operation.RPC_CALL, deviceId, new HttpValidationCallback(response, new FutureCallback<>() {
+            accessValidator.validate(currentUser, Operation.RPC_CALL, realDevice, new HttpValidationCallback(response, new FutureCallback<>() {
                 @Override
                 public void onSuccess(@Nullable DeferredResult<ResponseEntity> result) {
+
                     ToDeviceRpcRequest rpcRequest = new ToDeviceRpcRequest(rpcRequestUUID,
                             tenantId,
-                            deviceId,
+                            realDevice,
                             oneWay,
                             expTime,
                             body,
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @3612fa7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @3612fa7
@@ -95,16 +95,11 @@ public class TkDeviceScriptController extends BaseController {
             return ResponseEntity.ok(false);
         }
-        /**脚本引擎启用/禁用时,刷新规则引擎中缓存的脚本ID对应的脚本内容,禁用时为默认脚本*/
-//    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id,null);
-//    for (DeviceProfileDTO profile : usedProfiles) {
-//      DeviceProfile tbDeviceProfile =
-//              buildTbDeviceProfileFromDeviceProfileDTO(
-//                      profile, id,scriptDTO.getScriptType());
-//      updateTbDeviceProfile(tbDeviceProfile);
-//    }
-
+        /**脚本引擎启用/禁用时,刷新设备接入服务中的脚本,禁用时使用默认脚本*/
         scriptService.updateScriptStatus(tenantId, id, status);
+        scriptService.getDeviceScript(tenantId, id).ifPresent(i->{
+            tbClusterService.onJsScriptChange(i,null);
+        });
         return ResponseEntity.ok(true);
     }
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @3612fa7
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @3612fa7
@@ -27,6 +27,8 @@ import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.id.ScriptId;
 import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.Device;
@@ -473,4 +475,12 @@ public class DefaultTbClusterService implements TbClusterService {
                 break;
         }
     }
+
+
+    //Thingskit function
+    @Override
+    public void onJsScriptChange(TkDeviceScriptDTO script, TbQueueCallback callback) {
+    broadcastEntityChangeToTransport(
+        new TenantId(UUID.fromString(script.getTenantId())), new ScriptId(UUID.fromString(script.getId())), script, callback);
+    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @3612fa7
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @3612fa7
@@ -679,30 +679,22 @@ public class DefaultTransportApiService implements TransportApiService {
     //Thingskit function
     private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.ScriptProto requestMsg) {
-
-        int type = requestMsg.getFunctionType();
-        UUID scriptId = getUUID(requestMsg.getScriptIdLSB(),requestMsg.getScriptIdMSB());
-
-        List<TkDeviceScriptDTO> allScriptes = scriptService.getScriptes(Arrays.stream(TkScriptFunctionType.values()).filter(f->f.ordinal()==type).findFirst().get(),null,null,scriptId);
+        List<TkDeviceScriptDTO> allScriptes = scriptService.getScriptes();
         TransportApiResponseMsg.Builder responseBuilder = TransportApiResponseMsg.newBuilder();
-        allScriptes.forEach(item->{
-            UUID tenantId = UUID.fromString(item.getTenantId());
-            UUID id = UUID.fromString(item.getId());
-            responseBuilder.addScriptsResponseMsg(TransportProtos.ScriptProto.newBuilder()
-                    .setConvertJs(item.getConvertJs())
-                    .setTenantIdLSB(tenantId.getLeastSignificantBits())
-                    .setTenantIdMSB(tenantId.getMostSignificantBits())
-                    .setScriptIdLSB(id.getLeastSignificantBits())
-                    .setScriptIdMSB(id.getMostSignificantBits())
-                    .setFunctionType(item.getScriptType().ordinal())
-            );
+    allScriptes.forEach(
+        item -> {
+          UUID tenantId = UUID.fromString(item.getTenantId());
+          UUID id = UUID.fromString(item.getId());
+          responseBuilder.addScriptsResponseMsg(
+              TransportProtos.ScriptProto.newBuilder()
+                  .setConvertJs(item.getConvertJs())
+                  .setTenantIdLSB(tenantId.getLeastSignificantBits())
+                  .setTenantIdMSB(tenantId.getMostSignificantBits())
+                  .setScriptIdLSB(id.getLeastSignificantBits())
+                  .setScriptIdMSB(id.getMostSignificantBits())
+                  .setFunctionType(item.getScriptType().name())
+                  .setStatus(item.getStatus()));
         });
         return Futures.immediateFuture(responseBuilder.build());
     }
-    private UUID getUUID(long lsb,long msb){
-        if(lsb==0 && msb==0){
-            return null;
-        }
-        return new UUID(msb,lsb);
-    }
 }
--- a/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
View file @3612fa7
+++ b/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
View file @3612fa7
@@ -17,6 +17,7 @@ package org.thingsboard.server.cluster;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.Device;
@@ -86,4 +87,8 @@ public interface TbClusterService {
     void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId);
     void sendNotificationMsgToEdgeService(TenantId tenantId, EdgeId edgeId, EntityId entityId, String body, EdgeEventType type, EdgeEventActionType action);
+
+
+    //Thingskit function
+    void onJsScriptChange(TkDeviceScriptDTO script, TbQueueCallback callback);
 }
--- a/common/cluster-api/src/main/proto/queue.proto
View file @3612fa7
+++ b/common/cluster-api/src/main/proto/queue.proto
View file @3612fa7
@@ -789,8 +789,9 @@ message ScriptProto{
   int64 tenantIdLSB = 2;
 //  int64 projectIdMSB = 3;
 //  int64 projectIdLSB = 4;
-  int64 scriptIdMSB = 5;
-  int64 scriptIdLSB = 6;
-  int32 functionType = 7;
-  string convertJs = 8;
+  int64 scriptIdMSB = 3;
+  int64 scriptIdLSB = 4;
+  string functionType = 5;
+  string convertJs = 6;
+  int32 status = 7;
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
View file @3612fa7
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
View file @3612fa7
@@ -21,5 +21,5 @@ package org.thingsboard.server.common.data;
 public enum EntityType {
     TENANT, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, TENANT_PROFILE, DEVICE_PROFILE, API_USAGE_STATE, TB_RESOURCE, OTA_PACKAGE, EDGE, RPC
     //Thingskit function
-    , RUNNING_EXCEPTION,SCENE_ACT;
+    , RUNNING_EXCEPTION,SCENE_ACT,JS_SCRIPT;
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
View file @3612fa7
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/constant/FastIotConstants.java
View file @3612fa7
@@ -167,5 +167,7 @@ public interface FastIotConstants {
     public static String METHOD_NAME = "method";
     /**RPC参数*/
     public static String PARAMS_NAME = "params";
+    /**实控设备*/
+    public static String TARGET_ID = "target";
   }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/id/ScriptId.java 0 → 100644
View file @3612fa7
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/id/ScriptId.java 0 → 100644
View file @3612fa7
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.common.data.yunteng.id;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.UUID;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.UUIDBased;
+
+@ApiModel
+public class ScriptId extends UUIDBased implements EntityId {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonCreator
+    public ScriptId(@JsonProperty("id") UUID id) {
+        super(id);
+    }
+
+    public static ScriptId fromString(String sceneId) {
+        return new ScriptId(UUID.fromString(sceneId));
+    }
+
+    @Override
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "JS_SCRIPT", allowableValues = "JS_SCRIPT")
+    public EntityType getEntityType() {
+        return EntityType.JS_SCRIPT;
+    }
+}
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportContext.java
View file @3612fa7
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportContext.java
View file @3612fa7
@@ -22,13 +22,25 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.transport.TransportContext;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.tcp.adaptors.JsonTcpAdaptor;
 import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
 import javax.annotation.PostConstruct;
 import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 /**
@@ -77,11 +89,14 @@ public class TcpTransportContext extends TransportContext {
     private boolean proxyEnabled;
     private final AtomicInteger connectionsCounter = new AtomicInteger();
-
+    protected ScheduledExecutorService schedulerExecutor;
+    @Getter
+    private boolean ready=false;
     @PostConstruct
     public void init() {
         super.init();
         transportService.createGaugeStats("openConnections", connectionsCounter);
+        schedulerExecutor = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("tcp-init"));
     }
     public void channelRegistered() {
@@ -104,4 +119,19 @@ public class TcpTransportContext extends TransportContext {
         rateLimitService.onAuthFailure(address);
     }
+
+    @EventListener(ApplicationReadyEvent.class)
+    @Order(value = 2)
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        List<TransportProtos.ScriptProto> all =transportService.getScripts(TransportProtos.ScriptProto.newBuilder().setStatus(StatusEnum.ENABLE.getIndex()).build());
+        if(all ==null){
+            return;
+        }
+        all.forEach(i->{
+            UUID scriptId = new UUID(i.getScriptIdMSB(), i.getScriptIdLSB());
+            TkScriptFunctionType scriptType = TkScriptFunctionType.valueOf(i.getFunctionType());
+            jsEngine.cacheScript(scriptId, scriptType, i.getConvertJs(), StatusEnum.ENABLE.getIndex());
+        });
+        schedulerExecutor.schedule(()->ready=true,timeout, TimeUnit.MILLISECONDS);
+    }
 }
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
View file @3612fa7
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportHandler.java
View file @3612fa7
@@ -15,6 +15,13 @@
  */
 package org.thingsboard.server.transport.tcp;
+import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED;
+import static io.netty.handler.codec.mqtt.MqttMessageType.PUBACK;
+import static io.netty.handler.codec.mqtt.MqttMessageType.SUBACK;
+import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
+import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -30,18 +37,28 @@ import io.netty.handler.ssl.SslHandler;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
@@ -55,35 +72,15 @@ import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsRes
 import org.thingsboard.server.common.transport.service.DefaultTransportService;
 import org.thingsboard.server.common.transport.service.SessionMetaData;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.ScriptProto;
 import org.thingsboard.server.transport.tcp.adaptors.TcpAuthEntry;
-import org.thingsboard.server.transport.tcp.adaptors.TcpDownEntry;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
 import org.thingsboard.server.transport.tcp.adaptors.TcpUpEntry;
 import org.thingsboard.server.transport.tcp.script.TkScriptFactory;
+import org.thingsboard.server.transport.tcp.script.TkScriptInvokeService;
 import org.thingsboard.server.transport.tcp.session.TcpDeviceSessionCtx;
 import org.thingsboard.server.transport.tcp.session.TcpGatewaySessionHandler;
 import org.thingsboard.server.transport.tcp.util.ByteBufUtils;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;
-
-import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED;
-import static io.netty.handler.codec.mqtt.MqttMessageType.PUBACK;
-import static io.netty.handler.codec.mqtt.MqttMessageType.SUBACK;
-import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
-
 /**
  * @author Andrew Shvayka
  */
@@ -104,9 +101,6 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     volatile InetSocketAddress address;
     volatile TcpGatewaySessionHandler gatewaySessionHandler;
-
-
-    private final ConcurrentMap<UUID, String> authScripts;
     private final AtomicInteger authedCounter = new AtomicInteger();
@@ -116,22 +110,6 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         this.transportService = context.getTransportService();
         this.sslHandler = sslHandler;
         this.deviceSessionCtx = new TcpDeviceSessionCtx(sessionId, context);
-        this.authScripts = new ConcurrentHashMap<>();
-        List<ScriptProto> authScripts = this.transportService.getScripts(ScriptProto.newBuilder().setFunctionType(TkScriptFunctionType.TRANSPORT_TCP_AUTH.ordinal()).build());
-        authScripts.stream().forEach(i -> {
-            UUID scriptId = new UUID(i.getScriptIdMSB(), i.getScriptIdLSB());
-            deviceSessionCtx.cacheScript(scriptId, TkScriptFunctionType.TRANSPORT_TCP_AUTH, i.getConvertJs(), new FutureCallback<UUID>() {
-                @Override
-                public void onSuccess(@Nullable UUID result) {
-                    TcpTransportHandler.this.authScripts.put(scriptId, result.toString());
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                }
-            });
-
-        });
     }
     @Override
@@ -149,10 +127,14 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
         log.trace("【{}】 Processing msg: 【{}】", sessionId, msg);
-        if (address == null) {
-            address = getAddress(ctx);
-        }
         try {
+            if(!context.isReady()){
+                ctx.close();
+                return;
+            }
+            if (address == null) {
+                address = getAddress(ctx);
+            }
             if (msg instanceof ByteBuf) {
                 ByteBuf message = (ByteBuf) msg;
                 byte[] byteMsg = ByteBufUtils.buf2Bytes(message);
@@ -316,7 +298,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             deviceSessionCtx.setProvisionOnly(true);
             ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_ACCEPTED.name()));
         } else {
-            authScripts.forEach((id, idStr) -> {
+            TkScriptInvokeService.authScripts.forEach(id -> {
                 ListenableFuture item = context.getJsEngine().invokeFunction(id, accessToken);
                 Futures.addCallback(item, new FutureCallback<String>() {
                     @Override
@@ -494,7 +476,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     private void onValidateFailed(ChannelHandlerContext ctx, MqttConnectReturnCode msg) {
         authedCounter.incrementAndGet();
-        if (authScripts.size() == authedCounter.incrementAndGet()) {
+        if (TkScriptInvokeService.authScripts.size() == authedCounter.incrementAndGet()) {
             ctx.writeAndFlush(createTcpConnAckMsg(msg.name()));
             ctx.close();
         }
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/AbstractTkScriptInvokeService.java
View file @3612fa7
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/AbstractTkScriptInvokeService.java
View file @3612fa7
@@ -15,15 +15,29 @@
  */
 package org.thingsboard.server.transport.tcp.script;
+import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
+import org.thingsboard.server.common.transport.DeviceUpdatedEvent;
+import org.thingsboard.server.common.transport.yunteng.ScriptUpdatedEvent;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -57,11 +71,20 @@ public abstract class AbstractTkScriptInvokeService implements TkScriptInvokeSer
     @Override
     public ListenableFuture<UUID> eval(UUID id,TkScriptFunctionType scriptType, String scriptBody) {
             UUID scriptId = id == null?UUID.randomUUID():id;
-            String functionName = "invokeInternal_" + scriptId.toString().replace('-', '_');
-            String jsScript = generateJsScript(scriptType, functionName, scriptBody);
+        String functionName = getFunctionName(scriptId);
+        String jsScript = generateJsScript(scriptType, functionName, scriptBody);
             return doEval(scriptId, functionName, jsScript);
     }
+    @NotNull
+    /**
+     * 构建脚本函数名称
+     */
+    private static String getFunctionName(UUID scriptId) {
+        String functionName = "invokeInternal_" + scriptId.toString().replace('-', '_');
+        return functionName;
+    }
+
     @Override
     public ListenableFuture<Object> invokeFunction(UUID scriptId, Object... args) {
             String functionName = scriptIdToNameMap.get(scriptId);
@@ -153,4 +176,46 @@ public abstract class AbstractTkScriptInvokeService implements TkScriptInvokeSer
             return expirationTime;
         }
     }
+
+    @EventListener(ScriptUpdatedEvent.class)
+    public void onDeviceUpdatedOrCreated(ScriptUpdatedEvent scriptUpdatedEvent) throws Exception {
+        TkDeviceScriptDTO scriptDTO = scriptUpdatedEvent.getScript();
+        UUID scriptId = UUID.fromString(scriptDTO.getId());
+        cacheScript(scriptId,scriptDTO.getScriptType(),scriptDTO.getConvertJs(), scriptDTO.getStatus());
+    }
+
+    /**
+     * 编译并缓存脚本引擎
+     *
+     * @param scriptId   脚本引擎ID
+     * @param scriptType 脚本类型
+     * @param convertStr 脚本内容
+     * @param stats   脚本状态
+     */
+    public void cacheScript(UUID scriptId, TkScriptFunctionType scriptType, String convertStr, Integer stats) {
+        if(stats == StatusEnum.DISABLE.getIndex()){
+            authScripts.remove(scriptId);
+            try {
+                doRelease(scriptId,getFunctionName(scriptId));
+            } catch (Exception e) {
+                log.error(String.format("脚本【%s】内存释放失败：【%s】", convertStr, e));
+            }
+        } else if (stats == StatusEnum.ENABLE.getIndex()) {
+            ListenableFuture<UUID> result = eval(scriptId, scriptType, convertStr);
+
+            Futures.addCallback(result, new FutureCallback() {
+                @Override
+                public void onSuccess(@Nullable Object result) {
+                    if(TkScriptFunctionType.TRANSPORT_TCP_AUTH == scriptType){
+                        authScripts.add(scriptId);
+                    }
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    log.error(String.format("脚本【%s】解析时出现异常：【%s】", convertStr, t));
+                }
+            }, MoreExecutors.directExecutor());
+        }
+    }
 }
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/TkScriptInvokeService.java
View file @3612fa7
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/script/TkScriptInvokeService.java
View file @3612fa7
@@ -16,9 +16,11 @@
 package org.thingsboard.server.transport.tcp.script;
 import com.google.common.util.concurrent.ListenableFuture;
+import lombok.Getter;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentSkipListSet;
 public interface TkScriptInvokeService {
@@ -46,4 +48,16 @@ public interface TkScriptInvokeService {
      */
     ListenableFuture<Void> release(UUID scriptId);
+
+    /**TCP协议的鉴权脚本*/
+    ConcurrentSkipListSet<UUID> authScripts = new ConcurrentSkipListSet<>();
+    /**
+     * 编译并缓存脚本引擎
+     *
+     * @param scriptId   脚本引擎ID
+     * @param scriptType 脚本类型
+     * @param convertStr 脚本内容
+     * @param stats   脚本状态
+     */
+    public void cacheScript(UUID scriptId, TkScriptFunctionType scriptType, String convertStr, Integer stats);
 }
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @3612fa7
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @3612fa7
@@ -87,36 +87,10 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
             this.authScriptId = UUID.fromString(tcpConfiguration.getAuthScriptId());
         }
         this.telemetryScriptId = UUID.fromString(tcpConfiguration.getUpScriptId());
-        TransportProtos.ScriptProto upScript = context.getTransportService().getScripts(TransportProtos.ScriptProto.newBuilder().setScriptIdLSB(telemetryScriptId.getLeastSignificantBits()).setScriptIdMSB(telemetryScriptId.getMostSignificantBits()).build()).get(0);
-        cacheScript(telemetryScriptId, TkScriptFunctionType.TRANSPORT_TCP_UP, upScript.getConvertJs(), null);
     }
-    /**
-     * 编译并缓存脚本引擎
-     *
-     * @param scriptId   脚本引擎ID
-     * @param scriptType 脚本类型
-     * @param convertStr 脚本内容
-     * @param callback   脚本引擎执行成功的回调函数
-     */
-    public void cacheScript(UUID scriptId, TkScriptFunctionType scriptType, String convertStr, FutureCallback callback) {
-        ListenableFuture<UUID> result = context.getJsEngine().eval(scriptId, scriptType, convertStr);
-        if (callback == null) {
-            callback = new FutureCallback() {
-                @Override
-                public void onSuccess(@Nullable Object result) {
-
-                }
-                @Override
-                public void onFailure(Throwable t) {
-                    log.error(String.format("脚本【%s】解析时出现异常：【%s】", convertStr, t));
-                }
-            };
-        }
-        Futures.addCallback(result, callback, MoreExecutors.directExecutor());
-    }
     /**
      * 执行上行数据的解析脚本
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @3612fa7
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @3612fa7
@@ -21,6 +21,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.protobuf.ByteString;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
@@ -49,6 +50,7 @@ import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
@@ -72,6 +74,7 @@ import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsRes
 import org.thingsboard.server.common.transport.limits.TransportRateLimitService;
 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
 import org.thingsboard.server.common.transport.util.JsonUtils;
+import org.thingsboard.server.common.transport.yunteng.ScriptUpdatedEvent;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
@@ -109,13 +112,7 @@ import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -188,6 +185,9 @@ public class DefaultTransportService implements TransportService {
     private final ConcurrentMap<UUID, SessionActivityData> sessionsActivity = new ConcurrentHashMap<>();
     private final Map<String, RpcRequestMetadata> toServerRpcPendingMap = new ConcurrentHashMap<>();
+    @Getter
+    /**TCP协议的鉴权脚本*/
+    private final ConcurrentSkipListSet<UUID> authScripts = new ConcurrentSkipListSet<>();
     private volatile boolean stopped = false;
     public DefaultTransportService(TbServiceInfoProvider serviceInfoProvider,
@@ -939,6 +939,13 @@ public class DefaultTransportService implements TransportService {
                         onDeviceUpdate(device);
                         eventPublisher.publishEvent(new DeviceUpdatedEvent(device));
                     });
+
+                    //Thingskit function
+                } else if (EntityType.JS_SCRIPT.equals(entityType)) {
+                    Optional<TkDeviceScriptDTO> deviceOpt = dataDecodingEncodingService.decode(msg.getData().toByteArray());
+                    deviceOpt.ifPresent(device -> {
+                        eventPublisher.publishEvent(new ScriptUpdatedEvent(device));
+                    });
                 }
             } else if (toSessionMsg.hasEntityDeleteMsg()) {
                 TransportProtos.EntityDeleteMsg msg = toSessionMsg.getEntityDeleteMsg();
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/yunteng/ScriptUpdatedEvent.java 0 → 100644
View file @3612fa7
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/yunteng/ScriptUpdatedEvent.java 0 → 100644
View file @3612fa7
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.common.transport.yunteng;
+
+import lombok.Getter;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+
+@Getter
+public class ScriptUpdatedEvent {
+    private final TkDeviceScriptDTO script;
+
+    public ScriptUpdatedEvent(TkDeviceScriptDTO script) {
+        this.script = script;
+    }
+}
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @3612fa7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @3612fa7
@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
@@ -101,17 +102,10 @@ public class TkDeviceScriptServiceImpl
   }
   @Override
-  public List<TkDeviceScriptDTO> getScriptes(TkScriptFunctionType type, UUID tenantId, UUID projectId, UUID scriptId){
+  public List<TkDeviceScriptDTO> getScriptes(){
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>().lambda();
-    if(scriptId == null){
-      queryWrapper.eq(TkDeviceScriptEntity::getScriptType, type);
-    }else{
-      queryWrapper.eq(TkDeviceScriptEntity::getId, scriptId.toString());
-    }
-    if(tenantId != null){
-      queryWrapper.eq(TkDeviceScriptEntity::getTenantId, tenantId.toString());
-    }
+    queryWrapper.eq(TkDeviceScriptEntity::getStatus, StatusEnum.ENABLE.getIndex());
     List<TkDeviceScriptEntity> result = baseMapper.selectList(queryWrapper);
     return result.stream()
             .map(item -> item.getDTO(TkDeviceScriptDTO.class))
@@ -250,7 +244,7 @@ public class TkDeviceScriptServiceImpl
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-                .eq(TkDeviceScriptEntity::getStatus,1)
+                .eq(TkDeviceScriptEntity::getStatus,StatusEnum.ENABLE.getIndex())
                 .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()
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
View file @3612fa7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceScriptService.java
View file @3612fa7
@@ -13,11 +13,9 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
     /**
      * 查找脚本解析的脚本内容
-     * @param tenantId
-     * @param scriptId
      * @return
      */
-    List<TkDeviceScriptDTO> getScriptes(TkScriptFunctionType type, UUID tenantId, UUID projectId, UUID scriptId);
+    List<TkDeviceScriptDTO> getScriptes();
     TkDeviceScriptDTO insertOrUpdate(TkDeviceScriptDTO deviceDTO);
--- a/dao/src/main/resources/mapper/DeviceMapper.xml
View file @3612fa7
+++ b/dao/src/main/resources/mapper/DeviceMapper.xml
View file @3612fa7
@@ -68,14 +68,14 @@
     </resultMap>
     <sql id="basicColumns">
-        ifd.id
+        ifd.id,ifd.gateway_id
         ,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
     </sql>
     <sql id="detailColumns">
         <include refid="pageColumns"/>
-        ,ifd.gateway_id,idg.name gateway_name,idg.alias gateway_alias
+        ,idg.name gateway_name,idg.alias gateway_alias
     </sql>
     <sql id="pageColumns">
         <include refid="basicColumns"/>