Merge branch 'master_dev' into 'master'

Master dev See merge request yunteng/thingskit!412

Merge branch 'master_dev' into 'master'
Master dev See merge request yunteng/thingskit!412
xp.Huang
2 parents 78201e0a ec153776
Showing 81 changed files with 645 additions and 327 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/AlarmProfileController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmContactController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmInfoController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmNoticeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAppDesignController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAreaController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationCenterController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentNodeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationNodeController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataBoardController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataComponentController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewContentController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewController.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/AlarmProfileController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/AlarmProfileController.java
View file @e417d05
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -22,6 +23,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/alarm/profile")
 @Api(tags = {"告警配置"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @e417d05
@@ -27,12 +27,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 @RequestMapping("api/yt/homepage")
 @Api(tags = {"首页"})
 @RequiredArgsConstructor
 @RestController
+@TbCoreComponent
 public class HomePageController extends BaseController {
   private final HomePageService homePageService;
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobController.java
View file @e417d05
@@ -32,9 +32,11 @@ import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /** 调度任务信息操作处理 */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/monitor/job")
 @RequiredArgsConstructor
 @Api(tags = {"定时任务"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/SysJobLogController.java
View file @e417d05
@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 /** 调度日志操作处理 */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/monitor/job_log")
 @RequiredArgsConstructor
 @Api(tags = {"定时任务执行日志"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/ThingsModelController.java
View file @e417d05
@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
 import org.thingsboard.server.utils.ImportModbusUtils;
@@ -48,6 +49,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/things_model")
 @Api(tags = {"物模型管理"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @e417d05
@@ -36,6 +36,7 @@ import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.tenant.TbTenantService;
 import org.thingsboard.server.service.entitiy.user.TbUserService;
 import org.thingsboard.server.service.install.InstallScripts;
@@ -51,6 +52,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/admin")
 @Api(tags = {"租户管理", "菜单管理"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmContactController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmContactController.java
View file @e417d05
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.net.URI;
 import java.util.HashMap;
@@ -36,6 +37,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Description 告警联系人 @Author cxy @Date 2021/11/2 14:54
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/alarm_contact")
 @RequiredArgsConstructor
 @Api(tags = "告警联系人")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmInfoController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmInfoController.java
View file @e417d05
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @Description 告警中心 @Author cxy @Date 2021/11/11 9:23
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/alarm")
 @RequiredArgsConstructor
 @Api(tags = "告警中心")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmNoticeController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAlarmNoticeController.java
View file @e417d05
@@ -9,6 +9,7 @@ import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.dao.yunteng.service.TkNoticeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 import java.net.InetAddress;
@@ -24,6 +25,7 @@ import java.net.InetAddress;
  * @Copyright 2016-2018  - Powered By 云腾五洲
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/notice")
 @RequiredArgsConstructor
 @Slf4j
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAppDesignController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAppDesignController.java
View file @e417d05
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /**
  * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysAppDesignService;
  */
 @Api(tags = "APP定制")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/app_design")
 @RequiredArgsConstructor
 public class TkAppDesignController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAreaController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAreaController.java
View file @e417d05
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.dao.yunteng.service.SysAreaService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.List;
  */
 @Api(tags = "中国省市区街关联")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/area")
 @RequiredArgsConstructor
 public class TkAreaController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationCenterController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationCenterController.java
View file @e417d05
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationCenterService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/center")
 @RequiredArgsConstructor
 @Api(tags = "组态中心")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentController.java
View file @e417d05
@@ -15,8 +15,10 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/content")
 @RequiredArgsConstructor
 @Api(tags = "组态内容")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentNodeController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationContentNodeController.java
View file @e417d05
@@ -22,11 +22,13 @@ import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationContentNodeService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /**
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/new/configuration/node")
 @RequiredArgsConstructor
 @Api(tags = "组态结点管理(新)")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationNodeController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConfigurationNodeController.java
View file @e417d05
@@ -15,6 +15,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationActService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationDatasourceService;
 import org.thingsboard.server.dao.yunteng.service.TkConfigurationEventService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
 import java.util.Optional;
@@ -23,6 +24,7 @@ import java.util.Optional;
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/configuration/node")
 @RequiredArgsConstructor
 @Api(tags = "组态结点管理")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @e417d05
@@ -40,10 +40,12 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/convert")
 @Api(tags = {"数据流转控制器"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataBoardController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataBoardController.java
View file @e417d05
@@ -23,12 +23,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/data_board")
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataComponentController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataComponentController.java
View file @e417d05
@@ -24,11 +24,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.ArrayList;
 import java.util.List;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 @RequestMapping("api/yt/data_component")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewContentController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewContentController.java
View file @e417d05
@@ -15,11 +15,13 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /**
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view/content")
 @RequiredArgsConstructor
 @Api(tags = "大屏内容")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewController.java
View file @e417d05
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view")
 @RequiredArgsConstructor
 @Api(tags = "大屏设计器")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewInterfaceController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDataViewInterfaceController.java
View file @e417d05
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TkSystemTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.*;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author tianfuLei
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/data_view_interface")
 @RequiredArgsConstructor
 @Api(tags = "大屏公共接口")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceAccessInformationController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceAccessInformationController.java
View file @e417d05
@@ -19,12 +19,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile/access_information")
 @Api(tags = {"设备接入信息管理"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @e417d05
@@ -40,6 +40,7 @@ import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
 import org.thingsboard.server.service.entitiy.device.TbDeviceService;
 import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService;
@@ -55,6 +56,7 @@ import java.util.concurrent.ExecutionException;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device")
 @Api(tags = {"设备管理"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileCategoryController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileCategoryController.java
View file @e417d05
@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileCategoryService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile/category")
 @Api(tags = {"产品品类管理"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @e417d05
@@ -34,6 +34,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -45,6 +46,7 @@ import java.util.concurrent.ExecutionException;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device_profile")
 @Api(tags = {"设备配置管理"})
@@ -200,8 +202,11 @@ public class TkDeviceProfileController extends BaseController {
               .getProfileData().getTransportConfiguration();
       if(tcpProfile.getTcpAuthType().equals(TcpAuthTypeEnum.DATA_COMBINATION)){
         String key = deviceProfileDTO.getTenantId() + "_" + deviceProfileDTO.getTbProfileId();
-        Map<String,Object> cacheMap = (Map<String, Object>)
-                cacheUtils.get(cacheName, FastIotConstants.OtherKey.DATA_COMBINATION_KEY).get();
+        Optional<Object> stringObjectMap = cacheUtils.get(cacheName, FastIotConstants.OtherKey.DATA_COMBINATION_KEY);
+        Map<String,Object> cacheMap = new HashMap<>();
+        if(stringObjectMap.isPresent()){
+          cacheMap = (Map<String,Object>)stringObjectMap.get();
+        }
         cacheMap.put(key,tcpProfile);
         cacheUtils.put(cacheName,FastIotConstants.OtherKey.DATA_COMBINATION_KEY,cacheMap);
       }
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @e417d05
@@ -30,6 +30,8 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +40,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/js")
 @Api(tags = {"设备数据解析脚本管理"})
@@ -81,9 +84,8 @@ public class TkDeviceScriptController extends BaseController {
         /**脚本引擎启用/禁用时,刷新设备接入服务中的脚本,禁用时使用默认脚本*/
         scriptService.updateScriptStatus(tenantId, id, status);
-        scriptService.getDeviceScript(tenantId, id).ifPresent(i->{
-            tbClusterService.onJsScriptChange(i,null);
-        });
+        scriptDTO.setStatus(status);
+        tbClusterService.onJsScriptChange(scriptDTO,null);
         return ResponseEntity.ok(true);
     }
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceStateLogController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceStateLogController.java
View file @e417d05
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceStateLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/device/state/log")
 @Api(tags = {"设备上下线记录"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceTypeController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceTypeController.java
View file @e417d05
@@ -17,10 +17,12 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceTypeDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceTypeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/device_type")
 @RequiredArgsConstructor
 @Api(value = "设备类型")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDictController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDictController.java
View file @e417d05
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysDictService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/dict")
 @RequiredArgsConstructor
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDictItemController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDictItemController.java
View file @e417d05
@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysDictItemService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +26,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/dict_item")
 @RequiredArgsConstructor
 public class TkDictItemController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkEnterpriseController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkEnterpriseController.java
View file @e417d05
@@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /**
  * @author: 徐浩然
@@ -18,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
  */
 @Api(tags = "企业信息")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/enterprise")
 @RequiredArgsConstructor
 public class TkEnterpriseController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkEventController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkEventController.java
View file @e417d05
@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.UUID;
@@ -25,6 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/event")
 @Api(tags = {"设备事件"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkFrpInfoController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkFrpInfoController.java
View file @e417d05
@@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO;
 import org.thingsboard.server.dao.yunteng.service.TkFrpInfoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/frp")
 @Api(tags = "Frp内网穿透信息")
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMailLogController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMailLogController.java
View file @e417d05
@@ -11,12 +11,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMailLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/mail_log")
 @RequiredArgsConstructor
 public class TkMailLogController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMapGeoJsonController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMapGeoJsonController.java
View file @e417d05
@@ -10,8 +10,10 @@ import org.thingsboard.server.common.data.yunteng.dto.TkMapGeoJsonDTO;
 import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.dao.yunteng.service.TkMapGeoJsonService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/map/geo_json")
 @RequiredArgsConstructor
 @Api(tags = "行政区域经纬度信息")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMenuController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMenuController.java
View file @e417d05
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.net.URI;
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.Optional;
 import java.util.Set;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/menu")
 public class TkMenuController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageConfigController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageConfigController.java
View file @e417d05
@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/message")
 @RequiredArgsConstructor
 public class TkMessageConfigController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageLogController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageLogController.java
View file @e417d05
@@ -14,12 +14,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMessageLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/message_log")
 @RequiredArgsConstructor
 public class TkMessageLogController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageTemplateController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkMessageTemplateController.java
View file @e417d05
@@ -25,12 +25,14 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkMailService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/template")
 @RequiredArgsConstructor
 public class TkMessageTemplateController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoAuthController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoAuthController.java
View file @e417d05
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.dao.yunteng.service.*;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Optional;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/noauth")
 @RequiredArgsConstructor
 public class TkNoAuthController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoticeController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoticeController.java
View file @e417d05
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,6 +32,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  */
 @Api(tags = "通知管理")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/notice")
 @RequiredArgsConstructor
 public class TkNoticeController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoticeUserController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkNoticeUserController.java
View file @e417d05
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysNoticeUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,6 +25,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  */
 @Api(tags = "我的通知")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/notice_user")
 @RequiredArgsConstructor
 public class TkNoticeUserController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOpinionController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOpinionController.java
View file @e417d05
@@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkOpinionEntity;
 import org.thingsboard.server.dao.yunteng.service.TkOpinionService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/opinion")
 @Api(tags = {"意见反馈"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOrganizationController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOrganizationController.java
View file @e417d05
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/organization")
 @Api(tags = "组织管理")
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOssFileController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkOssFileController.java
View file @e417d05
@@ -8,11 +8,13 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.utils.FileStorageService;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/oss")
 public class TkOssFileController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkPlatformDesignController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkPlatformDesignController.java
View file @e417d05
@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysPlatformDesignDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 /**
  * @author: 徐浩然
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.SysPlatformDesignService;
  */
 @Api(tags = "平台定制")
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/platform")
 @RequiredArgsConstructor
 public class TkPlatformDesignController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkReportFormConfigController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkReportFormConfigController.java
View file @e417d05
@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/report_form/config")
 @Api(tags = "报表配置信息")
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkReportGenerateRecordController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkReportGenerateRecordController.java
View file @e417d05
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/report/generate/record")
 @Api(tags = "报表生成记录")
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRoleController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRoleController.java
View file @e417d05
@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.RoleService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -22,6 +23,7 @@ import java.util.Set;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/role")
 @RequiredArgsConstructor
 public class TkRoleController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRpcRecordController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRpcRecordController.java
View file @e417d05
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.sql.Timestamp;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/rpc")
 @Api(tags = {"命令下发记录"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRtspConvertController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRtspConvertController.java
View file @e417d05
@@ -8,11 +8,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.dao.yunteng.service.rtsp.TkFLVService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/rtsp")
 @Api(tags = {"rtsp流转换"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRuleChainController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRuleChainController.java
View file @e417d05
@@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/rule_chain")
 @Api(tags = {"规则链管理"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSceneLinkageController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSceneLinkageController.java
View file @e417d05
@@ -26,6 +26,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.yunteng.aspect.annotation.AutoLog;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.net.URI;
 import java.util.*;
@@ -35,6 +36,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 /** @Description 场景联动 @Author cxy @Date 2021/11/25 11:25 */
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/scene_linkage")
 @RequiredArgsConstructor
 @Api(tags = "场景联动")
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkShareViewController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkShareViewController.java
View file @e417d05
@@ -12,8 +12,10 @@ import org.thingsboard.server.common.data.yunteng.enums.ShareViewType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkShareViewService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/share")
 @Api(tags = {"分享的视图"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSyslogController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkSyslogController.java
View file @e417d05
@@ -17,10 +17,12 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.entities.SysLogEntity;
 import org.thingsboard.server.dao.yunteng.service.TkSysLogService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/log")
 @Api(tags = {"日志管理"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTaskCenterController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTaskCenterController.java
View file @e417d05
@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
@@ -29,6 +30,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/task_center")
 @Api(tags = {"任务中心"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantController.java
View file @e417d05
@@ -15,12 +15,14 @@ import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordE
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 import java.util.UUID;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/tenant")
 public class TkTenantController extends AbstractUserAccount {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantProfilesController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantProfilesController.java
View file @e417d05
@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
 import java.util.UUID;
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/tenant_profiles")
 @RequiredArgsConstructor
 public class TkTenantProfilesController extends BaseController {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTestController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTestController.java
View file @e417d05
@@ -5,8 +5,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 @RestController
+@TbCoreComponent
 @RequestMapping("/api/yt/noauth/test")
 public class TkTestController {
   @PostMapping
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkThirdPlatformController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkThirdPlatformController.java
View file @e417d05
@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkThirdPlatformService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.yunteng.TkLoginResponse;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
@@ -45,6 +46,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
  * @author Administrator
  */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/third")
 @Api(tags = {"第三方小程序"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserCollectController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserCollectController.java
View file @e417d05
@@ -12,10 +12,12 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity;
 import org.thingsboard.server.dao.yunteng.service.TkUserCollectService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
 @RestController
+@TbCoreComponent
 @RequiredArgsConstructor
 @RequestMapping("api/yt/collect")
 @Api(tags = {"收藏功能"})
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @e417d05
@@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.SysUserEntity;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.customer.TbCustomerService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -60,6 +61,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/user")
 @Api(value = "用户接口")
 public class TkUserController extends AbstractUserAccount {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoChannelController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoChannelController.java
View file @e417d05
@@ -22,6 +22,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +31,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video/channel")
 @Api(tags = {"视频通道"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoController.java
View file @e417d05
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.service.TkVideoService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,6 +29,7 @@ import java.util.Map;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video")
 @Api(tags = {"视频流"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoPlatformController.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkVideoPlatformController.java
View file @e417d05
@@ -16,12 +16,14 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
 import org.thingsboard.server.dao.yunteng.service.TkVideoPlatformService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.util.List;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 @RestController
+@TbCoreComponent
 @RequestMapping("api/yt/video/platform")
 @Api(tags = {"流媒体平台配置"})
 @RequiredArgsConstructor
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @e417d05
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @e417d05
@@ -65,12 +65,14 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.queue.Queue;
 import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.yunteng.common.media.VideoStreamSessionManager;
 import org.thingsboard.server.common.data.yunteng.config.media.ZLMediaKitServerConfig;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.MediaServerDTO;
@@ -158,7 +160,7 @@ public class DefaultTransportApiService implements TransportApiService {
 	//thingskit
     private final CacheUtils cacheUtils;
     private final TkDeviceService tkDeviceService;
-    private final TkDeviceScriptService scriptService;
+    private final TkDeviceScriptService tkDeviceScriptService;
     private final TkVideoChannelService channelService;
     private final TkMediaServerNodeService mediaServerNodeService;
     private final VideoStreamSessionManager videoStreamSessionManager;
@@ -254,6 +256,10 @@ public class DefaultTransportApiService implements TransportApiService {
             TransportProtos.ValidateTcpDeviceTokenRequestMsg msg = transportApiRequestMsg.getValidateTcpTokenRequestMsg();
             final String token = msg.getToken();
             result = handlerExecutor.submit(() -> validateTcpUdpCredentials(token, DeviceCredentialsType.ACCESS_TOKEN));
+        } else if(transportApiRequestMsg.hasUpScriptRequestMsg()){
+            result = handle(transportApiRequestMsg.getUpScriptRequestMsg());
+        } else if(transportApiRequestMsg.hasDataCombinationRequest()){
+            result = handle(transportApiRequestMsg.getDataCombinationRequest());
         }
         return Futures.transform(Optional.ofNullable(result).orElseGet(this::getEmptyTransportApiResponseFuture),
@@ -833,25 +839,41 @@ public class DefaultTransportApiService implements TransportApiService {
     }
 		// Thingskit function
 	  private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.ScriptProto requestMsg) {
-	    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())
-	                  .setStatus(item.getStatus()));
-	        });
+        List<TkDeviceScriptDTO> scriptDTOS = tkDeviceScriptService.findAllEnabledScript();
+        TransportApiResponseMsg.Builder responseBuilder = TransportApiResponseMsg.newBuilder();
+        if(null != scriptDTOS && !scriptDTOS.isEmpty()){
+            responseBuilder.addAllScriptResponseProto(scriptDTOS.stream().map(script->{
+                UUID uuid = UUID.fromString(script.getTenantId());
+                return TransportProtos.ScriptResponseProto.newBuilder().setTenantIdLSB(uuid.getLeastSignificantBits())
+                        .setTenantIdMSB(uuid.getMostSignificantBits())
+                        .setScriptId(script.getId())
+                        .setScriptLanguage(script.getScriptLanguage().name())
+                        .setScriptType(script.getScriptType())
+                        .setContent(script.getScriptLanguage().equals(ScriptLanguage.TBEL)?
+                                script.getConvertTbel():script.getConvertJs()).build();
+            }).collect(Collectors.toList())).build();
+        }
 	    return Futures.immediateFuture(responseBuilder.build());
 	  }
+      private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.DataCombinationMsg requestMsg){
+          try {
+              List<DeviceProfile> profiles = deviceProfileService.findByDataCombinationIsTrue().get();
+              if(null != profiles && !profiles.isEmpty()){
+                  Map<String, Object> cacheMap = new HashMap<>();
+                  for (DeviceProfile deviceProfile : profiles) {
+                      cacheMap.put(deviceProfile.getTenantId() + "_" +
+                              deviceProfile.getId().toString(),deviceProfile.getProfileData().getTransportConfiguration());
+                  }
+                  cacheUtils.put(FastIotConstants.CacheConfigKey.TCP_DATA_COMBINATION_KEY, FastIotConstants.OtherKey.DATA_COMBINATION_KEY,cacheMap);
+              }
+          }catch (Exception e){
+              log.error(ErrorMessage.CACHE_DATA_COMBINATION_FAILED.getMessage());
+          }
+          TransportApiResponseMsg.Builder responseBuilder = TransportApiResponseMsg.newBuilder();
+          return Futures.immediateFuture(responseBuilder.build());
+      }
+
 	  private ListenableFuture<TransportApiResponseMsg> handleGbt(
 	      TransportProtos.Gbt28181RequestMsg requestMsg) {
 	    TransportProtos.Gbt28181ResponseMsg.Builder responseMsgBuilder =
@@ -1023,5 +1045,17 @@ public class DefaultTransportApiService implements TransportApiService {
 	    }
 	    return null;
 	  }
-
+      //thingskit
+    private ListenableFuture<TransportApiResponseMsg> handle(TransportProtos.UpScriptProto requestMsg){
+        String upScriptId =  requestMsg.getUpScriptId();
+        TransportProtos.UpScriptResponseProto.Builder builder = TransportProtos.UpScriptResponseProto.newBuilder();
+        if(StringUtils.isNotEmpty(upScriptId)){
+            ScriptLanguage language = tkDeviceScriptService.findScriptLanguageById(upScriptId);
+            builder.setScriptLanguage(null != language ? language.name():null);
+        }
+        return Futures.immediateFuture(
+                TransportApiResponseMsg.newBuilder()
+                        .setUpScriptResponseMsg(builder.build())
+                        .build());
+    }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TkTcpDeviceProfileTransportConfiguration.java
View file @e417d05
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TkTcpDeviceProfileTransportConfiguration.java
View file @e417d05
@@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.validation.NoXss;
 import org.thingsboard.server.common.data.yunteng.enums.ProtocolAnalysisEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TcpAuthTypeEnum;
+import java.io.Serializable;
+
 @Data
 public class TkTcpDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
     /**
@@ -56,7 +58,8 @@ public class TkTcpDeviceProfileTransportConfiguration implements DeviceProfileTr
     }
     @Data
-     public class DataCombinationAuth {
+     public class DataCombinationAuth implements Serializable {
+
         /**
          * 数据截取开始的下标
          */
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/common/TkCommonService.java
View file @e417d05
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/common/TkCommonService.java
View file @e417d05
@@ -17,22 +17,4 @@ public interface TkCommonService {
    * @return 返回字典Item表
    */
   SysDictItemDTO getDictValueByCodeAndText(String dictCode, String codeValue);
-
-  /**
-   * 获取所有数据携带的产品即设备配置
-   * @return 产品列表
-   */
-  ListenableFuture<List<DeviceProfile>> findByDataCombinationIsTrue();
-
-  /**
-   * 根据脚本ID查询脚本使用的语言
-   * @param scriptId 脚本ID
-   * @return 脚本语言
-   */
-  ScriptLanguage getScriptLanguageById(String scriptId);
-
-  /**
-   * 启动所有的脚本
-   */
-  void evalAllEnabledScript();
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/LocalFileStorageService.java
View file @e417d05
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/LocalFileStorageService.java
View file @e417d05
@@ -133,6 +133,7 @@ public class LocalFileStorageService implements FileStorageService {
   @Override
   public boolean deleteFile(String deleteFilePath) {
+    //TODO delete local file or delete datafile
     return false;
   }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/MinioFileStorageService.java
View file @e417d05
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/utils/MinioFileStorageService.java
View file @e417d05
@@ -16,6 +16,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -177,7 +178,13 @@ public class MinioFileStorageService implements FileStorageService {
   public boolean deleteFile(String deleteFilePath) {
     boolean result =false;
     try{
-      minioClient.removeObject(RemoveObjectArgs.builder().bucket(fileStorageProperties.getBucketName())
+      String bucketName = fileStorageProperties.getBucketName();
+      int one = FastIotConstants.MagicNumber.ONE;
+      String[]  split = deleteFilePath.split(bucketName + "/");
+      if(split.length>one){
+        deleteFilePath = split[one];
+      }
+      minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucketName)
               .object(deleteFilePath).build());
       result = true;
     }catch (Exception e){
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/request/TkDataViewContentInfoDTO.java
View file @e417d05
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/request/TkDataViewContentInfoDTO.java
View file @e417d05
@@ -16,7 +16,8 @@ public class TkDataViewContentInfoDTO {
     private Integer state;
     @ApiModelProperty(value = "组织ID")
     private String organizationId;
-
+    @ApiModelProperty(value = "缩略图")
+    private String thumbnail;
     @ApiModelProperty(value = "大屏内容",required = true)
     private TkDataViewContentDTO dataViewContent;
 }
--- a/common/proto/src/main/proto/queue.proto
View file @e417d05
+++ b/common/proto/src/main/proto/queue.proto
View file @e417d05
@@ -1278,6 +1278,8 @@ message TransportApiRequestMsg {
   Gbt28181RequestMsg gbt28181RequestMsg = 17;
   Gbt28181MediaServerMsg gbt28181MediaServerMsg = 18;
   ValidateTcpDeviceTokenRequestMsg validateTcpTokenRequestMsg = 19;
+  UpScriptProto upScriptRequestMsg = 20;
+  DataCombinationMsg dataCombinationRequest = 21;
 }
 /* Response from ThingsBoard Core Service to Transport Service */
@@ -1294,9 +1296,10 @@ message TransportApiResponseMsg {
   GetDeviceCredentialsResponseMsg deviceCredentialsResponseMsg = 10;
   repeated GetQueueRoutingInfoResponseMsg getQueueRoutingInfoResponseMsgs = 11;
   //Thingskit function
-  repeated ScriptProto scriptsResponseMsg = 12;
+  UpScriptResponseProto upScriptResponseMsg = 12;
   Gbt28181ResponseMsg gbt28181ResponseMsg = 13;
   repeated Gbt28181MediaServerMsg gbt28181MediaServerMsg = 14;
+  repeated ScriptResponseProto  scriptResponseProto  = 15;
 }
 /* Messages that are handled by ThingsBoard Core Service */
@@ -1435,17 +1438,29 @@ message LifecycleEventProto {
   string error = 8;
 }
-//Thingskit function  请求：functionType、；响应：tenantId、projectId、scriptId、convertJs
+//Thingskit function
+
+message DataCombinationMsg{
+
+}
+
 message ScriptProto{
+
+}
+message ScriptResponseProto{
   int64 tenantIdMSB = 1;
   int64 tenantIdLSB = 2;
-//  int64 projectIdMSB = 3;
-//  int64 projectIdLSB = 4;
-  int64 scriptIdMSB = 3;
-  int64 scriptIdLSB = 4;
-  string functionType = 5;
-  string convertJs = 6;
-  int32 status = 7;
+  string scriptId  = 3;
+  string scriptLanguage = 4;
+  string scriptType  = 5;
+  string content = 6;
+
+}
+message UpScriptProto{
+  string upScriptId = 1;
+}
+message UpScriptResponseProto{
+  string scriptLanguage = 1;
 }
 //thingskit function 设备上报的物模型事件
 message PostEventMsg {
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportContext.java
View file @e417d05
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/TcpTransportContext.java
View file @e417d05
 /**
  * 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
+ * <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
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>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
+ * <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;
@@ -24,140 +22,185 @@ 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.script.api.ScriptType;
 import org.thingsboard.script.api.js.JsInvokeService;
 import org.thingsboard.script.api.tbel.TbelInvokeService;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.yunteng.common.TkCommonService;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.transport.TransportContext;
+import org.thingsboard.server.common.transport.yunteng.ScriptUpdatedEvent;
+import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.transport.tcp.adaptors.JsonTcpAdaptor;
 import javax.annotation.PostConstruct;
 import java.net.InetSocketAddress;
-import java.util.HashMap;
+
+import org.thingsboard.server.gen.transport.TransportProtos;
+
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-/**
- * Created by ashvayka on 04.10.18.
- */
+/** Created by ashvayka on 04.10.18. */
 @Slf4j
 @Component
-@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.tcp.enabled}'=='true')")
+@ConditionalOnExpression(
+    "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.tcp.enabled}'=='true')")
 public class TcpTransportContext extends TransportContext {
-    @Getter
-    @Autowired(required = false)
-    private TcpSslHandlerProvider sslHandlerProvider;
-
-    /**注入多种数据协议处理器，例如：modbus等*/
-    @Getter
-    @Autowired
-    private JsonTcpAdaptor jsonTcpAdaptor;
-
-    @Getter
-    @Autowired
-    private JsInvokeService jsEngine;
-
-    @Getter
-    @Autowired
-    private TbelInvokeService tbelInvokeService;
-
-    @Getter
-    @Autowired
-    private CacheUtils cacheUtils;
-
-    @Getter
-    @Autowired
-    private TkCommonService tkCommonService;
-
-    @Getter
-    @Value("${transport.tcp.netty.max_payload_size}")
-    private Integer maxPayloadSize;
-
-    @Getter
-    @Value("${transport.tcp.ssl.skip_validity_check_for_client_cert:false}")
-    private boolean skipValidityCheckForClientCert;
-
-    @Getter
-    @Setter
-    private SslHandler sslHandler;
-
-    @Getter
-    @Value("${transport.tcp.msg_queue_size_per_device_limit:100}")
-    private int messageQueueSizePerDeviceLimit;
-
-    @Getter
-    @Value("${transport.tcp.timeout:10000}")
-    private long timeout;
-
-    @Getter
-    @Value("${transport.tcp.proxy_enabled:false}")
-    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"));
+  @Getter
+  @Autowired(required = false)
+  private TcpSslHandlerProvider sslHandlerProvider;
+
+  /** 注入多种数据协议处理器，例如：modbus等 */
+  @Getter @Autowired private JsonTcpAdaptor jsonTcpAdaptor;
+
+  @Getter @Autowired private JsInvokeService jsEngine;
+
+  @Getter @Autowired private TbelInvokeService tbelInvokeService;
+
+  @Getter @Autowired private CacheUtils cacheUtils;
+
+  @Getter
+  @Value("${transport.tcp.netty.max_payload_size}")
+  private Integer maxPayloadSize;
+
+  @Getter
+  @Value("${transport.tcp.ssl.skip_validity_check_for_client_cert:false}")
+  private boolean skipValidityCheckForClientCert;
+
+  @Getter @Setter private SslHandler sslHandler;
+
+  @Getter
+  @Value("${transport.tcp.msg_queue_size_per_device_limit:100}")
+  private int messageQueueSizePerDeviceLimit;
+
+  @Getter
+  @Value("${transport.tcp.timeout:10000}")
+  private long timeout;
+
+  @Getter
+  @Value("${transport.tcp.proxy_enabled:false}")
+  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() {
+    connectionsCounter.incrementAndGet();
+  }
+
+  public void channelUnregistered() {
+    connectionsCounter.decrementAndGet();
+  }
+
+  public boolean checkAddress(InetSocketAddress address) {
+    return rateLimitService.checkAddress(address);
+  }
+
+  public void onAuthSuccess(InetSocketAddress address) {
+    rateLimitService.onAuthSuccess(address);
+  }
+
+  public void onAuthFailure(InetSocketAddress address) {
+    rateLimitService.onAuthFailure(address);
+  }
+
+  @EventListener(ApplicationReadyEvent.class)
+  @AfterStartUp(order = AfterStartUp.AFTER_TRANSPORT_SERVICE)
+  public void onApplicationEvent() {
+    String cacheName = FastIotConstants.CacheConfigKey.TCP_DATA_COMBINATION_KEY;
+    // 先清理掉数据携带的所有缓存
+    cacheUtils.invalidateCacheName(cacheName);
+    transportService.process(TransportProtos.DataCombinationMsg.newBuilder().build());
+    List<TransportProtos.ScriptResponseProto> protoList =
+        transportService.findAllEnabledScript(TransportProtos.ScriptProto.newBuilder().build());
+
+    if (null != protoList && !protoList.isEmpty()) {
+      for (TransportProtos.ScriptResponseProto script : protoList) {
+        TenantId tbTenantId =
+            TenantId.fromUUID(new UUID(script.getTenantIdMSB(), script.getTenantIdLSB()));
+        String scriptId = script.getScriptId();
+        ScriptType scriptType = ScriptType.valueOf(script.getScriptType());
+        String content = script.getContent();
+        evalScript(
+            scriptId,
+            scriptType,
+            content,
+            ScriptLanguage.valueOf(script.getScriptLanguage()),
+            tbTenantId,
+            StatusEnum.ENABLE.getIndex());
+      }
     }
-
-    public void channelRegistered() {
-        connectionsCounter.incrementAndGet();
-    }
-
-    public void channelUnregistered() {
-        connectionsCounter.decrementAndGet();
-    }
-
-    public boolean checkAddress(InetSocketAddress address) {
-        return rateLimitService.checkAddress(address);
-    }
-
-    public void onAuthSuccess(InetSocketAddress address) {
-        rateLimitService.onAuthSuccess(address);
-    }
-
-    public void onAuthFailure(InetSocketAddress address) {
-        rateLimitService.onAuthFailure(address);
-    }
-
-
-    @EventListener(ApplicationReadyEvent.class)
-    @Order(value = 2)
-    public void onApplicationEvent() {
-        String cacheName = FastIotConstants.CacheConfigKey.TCP_DATA_COMBINATION_KEY;
-        //先清理掉数据携带的所有缓存
-        cacheUtils.invalidateCacheName(cacheName);
-        try{
-            //检查是否有数据携带的产品,如果有则进行缓存
-            List<DeviceProfile> profiles = tkCommonService.findByDataCombinationIsTrue().get();
-            if(null != profiles && !profiles.isEmpty()){
-                Map<String, Object> cacheMap = new HashMap<>();
-                for (DeviceProfile deviceProfile : profiles) {
-                    cacheMap.put(deviceProfile.getTenantId() + "_" +
-                            deviceProfile.getId().toString(),deviceProfile.getProfileData().getTransportConfiguration());
-                }
-                cacheUtils.put(cacheName, FastIotConstants.OtherKey.DATA_COMBINATION_KEY,cacheMap);
-            }
-           //获取所有启动的脚本,调用对应的脚本eval
-           tkCommonService.evalAllEnabledScript();
-        }catch (Exception e){
-            log.error(ErrorMessage.CACHE_DATA_COMBINATION_FAILED.getMessage());
+    schedulerExecutor.schedule(() -> ready = true, timeout, TimeUnit.MILLISECONDS);
+  }
+
+  @EventListener(ScriptUpdatedEvent.class)
+  public void onScriptUpdatedEvent(ScriptUpdatedEvent event) {
+    TkDeviceScriptDTO script = event.getScript();
+    TenantId tenantId = TenantId.fromUUID(UUID.fromString(script.getTenantId()));
+    String content =
+        Objects.equals(script.getScriptLanguage(), ScriptLanguage.JS)
+            ? script.getConvertJs()
+            : script.getConvertTbel();
+    evalScript(
+        script.getId(),
+        ScriptType.valueOf(script.getScriptType()),
+        content,
+        script.getScriptLanguage(),
+        tenantId,
+        script.getStatus());
+  }
+
+  private void evalScript(
+      String scriptId,
+      ScriptType scriptType,
+      String content,
+      ScriptLanguage scriptLanguage,
+      TenantId tenantId,
+      Integer status) {
+    String[] argNames = new String[] {"msg", "metadata", "msgType"};
+    boolean enabled = status.equals(StatusEnum.ENABLE.getIndex());
+    String message = enabled ? "eval" : "release";
+    try {
+      if (Objects.equals(scriptLanguage, ScriptLanguage.JS)) {
+        if (enabled) {
+          jsEngine.eval(tenantId, UUID.fromString(scriptId), scriptType, content, argNames).get();
+        } else {
+          jsEngine.release(UUID.fromString(scriptId));
+        }
+      }
+      if (Objects.equals(scriptLanguage, ScriptLanguage.TBEL)) {
+        if (enabled) {
+          tbelInvokeService
+              .eval(tenantId, UUID.fromString(scriptId), scriptType, content, argNames)
+              .get();
+        } else {
+          tbelInvokeService.release(UUID.fromString(scriptId));
         }
-        schedulerExecutor.schedule(()->ready=true,timeout, TimeUnit.MILLISECONDS);
+      }
+    } catch (ExecutionException | InterruptedException e) {
+      log.error("脚本{}{}失败", message, scriptId);
     }
+  }
 }
--- a/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @e417d05
+++ b/common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/session/TcpDeviceWareSessionContext.java
View file @e417d05
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ProtocolAnalysisEnum;
+import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -99,7 +100,18 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont
         TkTcpDeviceProfileTransportConfiguration tcpConfiguration = (TkTcpDeviceProfileTransportConfiguration) transportConfiguration;
        if( tcpConfiguration.getProtocol().equals(ProtocolAnalysisEnum.CUSTOM)){
            this.telemetryScriptId = UUID.fromString(tcpConfiguration.getUpScriptId());
-           this.scriptLanguage = context.getTkCommonService().getScriptLanguageById(tcpConfiguration.getUpScriptId());
+           getContext().getTransportService().process(sessionInfo, TransportProtos.UpScriptProto.newBuilder()
+                   .setUpScriptId(tcpConfiguration.getUpScriptId()).build(), new TransportServiceCallback<TransportProtos.UpScriptResponseProto>() {
+               @Override
+               public void onSuccess(TransportProtos.UpScriptResponseProto msg) {
+                   scriptLanguage = ScriptLanguage.valueOf(msg.getScriptLanguage());
+               }
+
+               @Override
+               public void onError(Throwable e) {
+                    log.error("通过上行脚本id获取脚本语言失败");
+               }
+           });
        }
     }
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportService.java
View file @e417d05
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportService.java
View file @e417d05
@@ -164,7 +164,7 @@ public interface TransportService {
     void createGaugeStats(String openConnections, AtomicInteger connectionsCounter);
     // Thingskit function:begin
-    List<TransportProtos.ScriptProto> getScripts(TransportProtos.ScriptProto msg);
+    List<TransportProtos.ScriptResponseProto> findAllEnabledScript(TransportProtos.ScriptProto msg);
     void process(SessionInfoProto sessionInfo, TransportProtos.PostEventMsg msg, TransportServiceCallback<Void> callback,
         String topicName);
@@ -178,5 +178,10 @@ public interface TransportService {
     void process(DeviceTransportType transportType, TransportProtos.ValidateTcpDeviceTokenRequestMsg msg,
                  TransportServiceCallback<ValidateDeviceCredentialsResponse> callback);
+
+    void process(SessionInfoProto sessionInfoProto,TransportProtos.UpScriptProto msg,TransportServiceCallback<
+            TransportProtos.UpScriptResponseProto> callback);
+
+    void process(TransportProtos.DataCombinationMsg msg);
   // Thingskit function:end
 }
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @e417d05
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View file @e417d05
@@ -1329,22 +1329,20 @@ public class DefaultTransportService extends TransportActivityManager implements
     }
       // Thingskit function
-	  @Override
-	  public List<TransportProtos.ScriptProto> getScripts(TransportProtos.ScriptProto msg) {
-	    TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
-	        new TbProtoQueueMsg<>(
-	            UUID.randomUUID(),
-	            TransportProtos.TransportApiRequestMsg.newBuilder().setScript(msg).build());
-	    try {
-	      TbProtoQueueMsg<TransportApiResponseMsg> response =
-	          transportApiRequestTemplate.send(protoMsg).get();
-	      return response.getValue().getScriptsResponseMsgList();
-	    } catch (InterruptedException | ExecutionException e) {
-	      throw new RuntimeException(e);
-	    }
-	  }
-
-	  // thingskit start
+      @Override
+      public List<TransportProtos.ScriptResponseProto> findAllEnabledScript(TransportProtos.ScriptProto msg){
+          TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
+                  new TbProtoQueueMsg<>(
+                          UUID.randomUUID(),
+                          TransportProtos.TransportApiRequestMsg.newBuilder().setScript(msg).build());
+          try {
+              TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
+              return response.getValue().getScriptResponseProtoList();
+          } catch (InterruptedException | ExecutionException e) {
+              throw new RuntimeException(e);
+          }
+      }
+    // thingskit start
 	  @Override
 	  public void process(
 	      TransportProtos.SessionInfoProto sessionInfo,
@@ -1390,5 +1388,23 @@ public class DefaultTransportService extends TransportActivityManager implements
                 TransportApiRequestMsg.newBuilder().setValidateTcpTokenRequestMsg(msg).build());
         doProcess(transportType, protoMsg, callback);
     }
+    @Override
+    public void process(TransportProtos.SessionInfoProto sessionInfo,TransportProtos.UpScriptProto msg,TransportServiceCallback<
+            TransportProtos.UpScriptResponseProto> callback){
+        TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(),
+                TransportApiRequestMsg.newBuilder().setUpScriptRequestMsg(msg).build());
+
+        AsyncCallbackTemplate.withCallback(transportApiRequestTemplate.send(protoMsg), response -> {
+            callback.onSuccess(response.getValue().getUpScriptResponseMsg());
+        }, callback::onError, transportCallbackExecutor);
+    }
+
+    @Override
+    public void process(TransportProtos.DataCombinationMsg msg) {
+        TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
+                new TbProtoQueueMsg<>(
+                        UUID.randomUUID(),TransportApiRequestMsg.newBuilder().setDataCombinationRequest(msg).build());
+        transportApiRequestTemplate.send(protoMsg);
+    }
     // thingskit end
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkCommonServiceImpl.java
View file @e417d05
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkCommonServiceImpl.java
View file @e417d05
 package org.thingsboard.server.dao.yunteng.impl;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.data.yunteng.common.TkCommonService;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysDictItemDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
-import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.yunteng.mapper.SysDictItemMapper;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class TkCommonServiceImpl implements TkCommonService {
-  private final SysDictItemMapper sysDictItemMapper;
-  private final DeviceProfileService deviceProfileService;
-  private final TkDeviceScriptService tkDeviceScriptService;
-  @Override
-  public SysDictItemDTO getDictValueByCodeAndText(String dictCode, String codeValue) {
-    return sysDictItemMapper.getDictValueByCodeAndText(dictCode, codeValue);
-  }
-
-  public ListenableFuture<List<DeviceProfile>> findByDataCombinationIsTrue(){
-    return deviceProfileService.findByDataCombinationIsTrue();
-  }
-
-  @Override
-  public ScriptLanguage getScriptLanguageById(String scriptId) {
-    return tkDeviceScriptService.findScriptLanguageById(scriptId);
-  }
+    private final SysDictItemMapper sysDictItemMapper;
-  @Override
-  public void evalAllEnabledScript() {
-    List<TkDeviceScriptDTO> scriptDTOS = tkDeviceScriptService.findAllEnabledScript();
-    if(null != scriptDTOS && !scriptDTOS.isEmpty()){
-      for (TkDeviceScriptDTO scriptDTO : scriptDTOS){
-        try {
-          tkDeviceScriptService.eval(scriptDTO.getTenantId(),scriptDTO.getId());
-        }catch (Exception e){
-          log.error(String.format(ErrorMessage.SCRIPT_EVAL_FAILED.getMessage(),scriptDTO.getTenantId(),scriptDTO.getId(),e.getMessage()));
-        }
-      }
+    @Override
+    public SysDictItemDTO getDictValueByCodeAndText(String dictCode, String codeValue) {
+        return sysDictItemMapper.getDictValueByCodeAndText(dictCode, codeValue);
     }
-  }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @e417d05
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @e417d05
 package org.thingsboard.server.dao.yunteng.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,7 +11,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.script.api.ScriptType;
 import org.thingsboard.script.api.js.JsInvokeService;
 import org.thingsboard.script.api.tbel.TbelInvokeService;
+import org.thingsboard.server.cluster.TbClusterService;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
@@ -26,6 +28,7 @@ import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
 import org.thingsboard.server.common.data.yunteng.utils.CrcUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
@@ -48,6 +51,9 @@ public class TkDeviceScriptServiceImpl
   private final TkDeviceService tkDeviceService;
   private final JsInvokeService jsInvokeService;
   private final TbelInvokeService tbelInvokeService;
+  private final TbClusterService tbClusterService;
+  private final DeviceProfileService deviceProfileService;
+  private final TkTenantService tenantService;
   @Override
   public boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created) {
@@ -107,27 +113,31 @@ public class TkDeviceScriptServiceImpl
   }
   @Override
-  public List<TkDeviceScriptDTO> getScriptes(){
+  public List<TkDeviceScriptDTO> getScriptes() {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>().lambda();
     queryWrapper.eq(TkDeviceScriptEntity::getStatus, StatusEnum.ENABLE.getIndex());
     List<TkDeviceScriptEntity> result = baseMapper.selectList(queryWrapper);
     return result.stream()
-            .map(item -> item.getDTO(TkDeviceScriptDTO.class))
-            .collect(Collectors.toList());
+        .map(item -> item.getDTO(TkDeviceScriptDTO.class))
+        .collect(Collectors.toList());
   }
   @Override
   public TkDeviceScriptDTO insertOrUpdate(TkDeviceScriptDTO deviceDTO) {
-    //判断脚本的内容
-    if(null == deviceDTO.getScriptLanguage()){
+    // 判断脚本的内容
+    if (null == deviceDTO.getScriptLanguage()) {
       deviceDTO.setScriptLanguage(ScriptLanguage.JS);
     }
-    if(Objects.equals(ScriptLanguage.JS,deviceDTO.getScriptLanguage()) && StringUtils.isEmpty(deviceDTO.getConvertJs())){
-      throw new DataValidationException(String.format(ErrorMessage.SCRIPT_CONTENT_IS_EMPTY.getMessage(),ScriptLanguage.JS));
+    if (Objects.equals(ScriptLanguage.JS, deviceDTO.getScriptLanguage())
+        && StringUtils.isEmpty(deviceDTO.getConvertJs())) {
+      throw new DataValidationException(
+          String.format(ErrorMessage.SCRIPT_CONTENT_IS_EMPTY.getMessage(), ScriptLanguage.JS));
     }
-    if(Objects.equals(ScriptLanguage.TBEL,deviceDTO.getScriptLanguage())&& StringUtils.isEmpty(deviceDTO.getConvertTbel())){
-      throw new DataValidationException(String.format(ErrorMessage.SCRIPT_CONTENT_IS_EMPTY.getMessage(),ScriptLanguage.TBEL));
+    if (Objects.equals(ScriptLanguage.TBEL, deviceDTO.getScriptLanguage())
+        && StringUtils.isEmpty(deviceDTO.getConvertTbel())) {
+      throw new DataValidationException(
+          String.format(ErrorMessage.SCRIPT_CONTENT_IS_EMPTY.getMessage(), ScriptLanguage.TBEL));
     }
     if (StringUtils.isBlank(deviceDTO.getId())) {
       return insert(deviceDTO);
@@ -139,15 +149,17 @@ public class TkDeviceScriptServiceImpl
   @Override
   public void checkDeviceScriptes(String tenantId, Set<String> ids) {
     // check if ids bind to device
-    if(ids == null || ids.isEmpty()){
+    if (ids == null || ids.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    for(String id : ids){
-      List<DeviceProfileDTO> profileList = tkDeviceProfileService.findDeviceProfileByScriptId(tenantId,id);
-      if(null != profileList && !profileList.isEmpty()){
-
-        throw new TkDataValidationException(String.format(ErrorMessage.PROJECT_USED_SCRIPT.getMessage(),
-                profileList.get(0).getName()));
+    for (String id : ids) {
+      List<DeviceProfileDTO> profileList =
+          tkDeviceProfileService.findDeviceProfileByScriptId(tenantId, id);
+      if (null != profileList && !profileList.isEmpty()) {
+
+        throw new TkDataValidationException(
+            String.format(
+                ErrorMessage.PROJECT_USED_SCRIPT.getMessage(), profileList.get(0).getName()));
       }
     }
   }
@@ -174,9 +186,13 @@ public class TkDeviceScriptServiceImpl
         ModelConstants.TablePropertyMapping.UPDATER,
         ModelConstants.TablePropertyMapping.CREATE_TIME,
         ModelConstants.TablePropertyMapping.UPDATE_TIME);
-    profile.setScriptType(null == deviceDTO.getScriptType() ?ScriptType.TRANSPORT_TCP_UP:ScriptType.valueOf(deviceDTO.getScriptType()));
+    profile.setScriptType(
+        null == deviceDTO.getScriptType()
+            ? ScriptType.TRANSPORT_TCP_UP
+            : ScriptType.valueOf(deviceDTO.getScriptType()));
     baseMapper.insert(profile);
-    return profile.getDTO(TkDeviceScriptDTO.class);
+    deviceDTO.setId(profile.getId());
+    return deviceDTO;
   }
   private TkDeviceScriptDTO update(TkDeviceScriptDTO deviceDTO) {
@@ -192,9 +208,35 @@ public class TkDeviceScriptServiceImpl
         ModelConstants.TablePropertyMapping.CREATE_TIME,
         ModelConstants.TablePropertyMapping.UPDATE,
         ModelConstants.TablePropertyMapping.UPDATE_TIME);
+    String tenantId = deviceDTO.getTenantId();
+    String scriptId = deviceDTO.getId();
+    Optional<TkDeviceScriptDTO> optional = getDeviceScript(tenantId, scriptId);
+    if (optional.isPresent()) {
+      TkDeviceScriptDTO deviceScriptDTO = optional.get();
+      // 如果脚本语言有更新,且有正在使用的产品，则需通知产品进行变更（脚本语言进行变更）
+      if (!Objects.equals(deviceScriptDTO.getScriptLanguage(), deviceDTO.getScriptLanguage())) {
+        // 查找正在使用的产品
+        List<DeviceProfileDTO> profiles =
+            tkDeviceProfileService.findDeviceProfileByScriptId(tenantId, scriptId);
+        if (null != profiles && !profiles.isEmpty()) {
+          for (DeviceProfileDTO dto : profiles) {
+            DeviceProfileId deviceProfileId =
+                new DeviceProfileId(UUID.fromString(dto.getTbProfileId()));
+            DeviceProfile deviceProfile =
+                deviceProfileService.findDeviceProfileById(
+                    TenantId.fromUUID(UUID.fromString(tenantId)), deviceProfileId);
+            if (null != deviceProfile) {
+              tbClusterService.onDeviceProfileChange(deviceProfile, null);
+            }
+          }
+        }
+      }
+    }
     baseMapper.updateById(device);
     device.setTenantId(deviceDTO.getTenantId());
-    return device.getDTO(TkDeviceScriptDTO.class);
+    TkDeviceScriptDTO updateScriptDTO = device.getDTO(TkDeviceScriptDTO.class);
+    updateScriptDTO.setScriptType(deviceDTO.getScriptType());
+    return updateScriptDTO;
   }
   @Override
@@ -202,12 +244,23 @@ public class TkDeviceScriptServiceImpl
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-            .eq(TkDeviceScriptEntity::getId, id).and(a -> a
-                        .eq(TkDeviceScriptEntity::getTenantId, tenantId).or(b->b.eq(TkDeviceScriptEntity::getTenantId,EntityId.NULL_UUID.toString())));
+            .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(
-            entity -> entity.getDTO(TkDeviceScriptDTO.class));
+            entity -> {
+              TkDeviceScriptDTO dto = entity.getDTO(TkDeviceScriptDTO.class);
+              dto.setScriptType(entity.getScriptType().name());
+              return dto;
+            });
   }
   @Override
@@ -224,11 +277,9 @@ public class TkDeviceScriptServiceImpl
             .map(Object::toString)
             .orElse(null);
     String name = Optional.ofNullable(queryMap.get("name")).map(Object::toString).orElse(null);
-    LocalDateTime startTime =
-            (LocalDateTime) queryMap.get("startTime");
-    LocalDateTime endTime =
-            (LocalDateTime) queryMap.get("endTime");
-    Integer status = null != queryMap.get("status") ? (Integer)queryMap.get("status") :  null;
+    LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
+    LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
+    Integer status = null != queryMap.get("status") ? (Integer) queryMap.get("status") : null;
     Set<String> scriptIds = null;
     if (!isTenantAdmin && StringUtils.isNotEmpty(customerId)) {
       scriptIds = getCustomerScripts(customerId, tenantId);
@@ -240,7 +291,7 @@ public class TkDeviceScriptServiceImpl
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
             .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                .eq(null != status,TkDeviceScriptEntity::getStatus,status)
+            .eq(null != status, TkDeviceScriptEntity::getStatus, status)
             .like(StringUtils.isNotEmpty(name), TkDeviceScriptEntity::getName, name)
             .and(
                 null != startTime && null != endTime,
@@ -258,14 +309,15 @@ public class TkDeviceScriptServiceImpl
   }
   @Override
-  public List<TkDeviceScriptDTO> findDeviceScript(String tenantId, ScriptType scriptType,DeviceTypeEnum serviceType) {
+  public List<TkDeviceScriptDTO> findDeviceScript(
+      String tenantId, ScriptType scriptType, DeviceTypeEnum serviceType) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-                .eq(TkDeviceScriptEntity::getStatus,StatusEnum.ENABLE.getIndex())
-                .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType)
-                .eq(serviceType!=null,TkDeviceScriptEntity::getServiceType,serviceType)
-                .eq(TkDeviceScriptEntity::getTenantId, tenantId);
+            .eq(TkDeviceScriptEntity::getStatus, StatusEnum.ENABLE.getIndex())
+            .eq(scriptType != null, TkDeviceScriptEntity::getScriptType, scriptType)
+            .eq(serviceType != null, TkDeviceScriptEntity::getServiceType, serviceType)
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId);
     return baseMapper.selectList(queryWrapper).stream()
         .map(item -> item.getDTO(TkDeviceScriptDTO.class))
         .collect(Collectors.toList());
@@ -289,15 +341,19 @@ public class TkDeviceScriptServiceImpl
                               .map(DeviceDTO::getDeviceProfileId)
                               .collect(Collectors.toList());
                       List<DeviceProfileDTO> deviceProfileDTOList =
-                          tkDeviceProfileService.findDeviceProfileByIds(tenantId, deviceProfiles, TransportTypeEnum.TCP);
+                          tkDeviceProfileService.findDeviceProfileByIds(
+                              tenantId, deviceProfiles, TransportTypeEnum.TCP);
                       return Optional.ofNullable(deviceProfileDTOList)
                           .map(
-                              deviceProfileDTOS ->{
+                              deviceProfileDTOS -> {
                                 Set<String> tcpScriptes = new HashSet<>();
-                                deviceProfileDTOS.forEach(p->{
-                                  TkTcpDeviceProfileTransportConfiguration config = (TkTcpDeviceProfileTransportConfiguration) p.getProfileData().getTransportConfiguration();
-                                  tcpScriptes.add(config.getUpScriptId());
-                                });
+                                deviceProfileDTOS.forEach(
+                                    p -> {
+                                      TkTcpDeviceProfileTransportConfiguration config =
+                                          (TkTcpDeviceProfileTransportConfiguration)
+                                              p.getProfileData().getTransportConfiguration();
+                                      tcpScriptes.add(config.getUpScriptId());
+                                    });
                                 return tcpScriptes;
                               })
                           .orElse(null);
@@ -315,113 +371,154 @@ public class TkDeviceScriptServiceImpl
     String functionCode = config.getMethod();
     result.append(functionCode);
     String addrStr = ByteUtils.integerToHex(config.getRegisterAddress());
-    result.append(addrStr.substring(addrStr.length()-4));
+    result.append(addrStr.substring(addrStr.length() - 4));
     List<Integer> values = config.getRegisterValues();
-    Integer registerNum = config.getRegisterNumber()==null?1:config.getRegisterNumber();
-    if(values ==null || values.isEmpty()){
-      //读寄存器数据
+    Integer registerNum = config.getRegisterNumber() == null ? 1 : config.getRegisterNumber();
+    if (values == null || values.isEmpty()) {
+      // 读寄存器数据
       result.append(modelHex(registerNum));
-    }else if(values.size() == 1 &&(TkModBusFunctionCode.WRITE_ONE_COIL.getCode().equals(functionCode) || TkModBusFunctionCode.WRITE_ONE_REGISTER.getCode().equals(functionCode) )){
-      //单个写入
+    } else if (values.size() == 1
+        && (TkModBusFunctionCode.WRITE_ONE_COIL.getCode().equals(functionCode)
+            || TkModBusFunctionCode.WRITE_ONE_REGISTER.getCode().equals(functionCode))) {
+      // 单个写入
       result.append(modelHex(values.get(0)));
-    }else{
-      //多个写入
+    } else {
+      // 多个写入
       result.append(modelHex(registerNum));
-      result.append(multData(functionCode,values));
+      result.append(multData(functionCode, values));
     }
-    result.append(CrcUtils.getSendBuf(config.getCrc(),result.toString()));
-
+    result.append(CrcUtils.getSendBuf(config.getCrc(), result.toString()));
     return result.toString();
   }
   @Override
-  public void eval(String tenantId, String scriptId) throws ExecutionException, InterruptedException {
-    TkDeviceScriptEntity entity = baseMapper.selectOne(new LambdaQueryWrapper<TkDeviceScriptEntity>()
-            .eq(TkDeviceScriptEntity::getId,scriptId));
-    if(null == entity){
+  public void eval(String tenantId, String scriptId)
+      throws ExecutionException, InterruptedException {
+    TkDeviceScriptEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDeviceScriptEntity>()
+                .eq(TkDeviceScriptEntity::getId, scriptId));
+    if (null == entity) {
       throw new TkDataValidationException("脚本不存在");
     }
     TenantId tbTenantId = new TenantId(UUID.fromString(tenantId));
     UUID scriptUUID = null;
-    String[] argNames = new String[]{"msg", "metadata", "msgType"};
-    if(Objects.equals(entity.getScriptLanguage(),ScriptLanguage.JS)){
-      scriptUUID= jsInvokeService.eval(tbTenantId,UUID.fromString(scriptId),entity.getScriptType(),
-              entity.getConvertJs(),argNames).get();
+    String[] argNames = new String[] {"msg", "metadata", "msgType"};
+    if (Objects.equals(entity.getScriptLanguage(), ScriptLanguage.JS)) {
+      scriptUUID =
+          jsInvokeService
+              .eval(
+                  tbTenantId,
+                  UUID.fromString(scriptId),
+                  entity.getScriptType(),
+                  entity.getConvertJs(),
+                  argNames)
+              .get();
     }
-    if(Objects.equals(entity.getScriptLanguage(),ScriptLanguage.TBEL)){
-      scriptUUID = tbelInvokeService.eval(tbTenantId,UUID.fromString(scriptId),entity.getScriptType(),
-              entity.getConvertTbel(),argNames).get();
+    if (Objects.equals(entity.getScriptLanguage(), ScriptLanguage.TBEL)) {
+      scriptUUID =
+          tbelInvokeService
+              .eval(
+                  tbTenantId,
+                  UUID.fromString(scriptId),
+                  entity.getScriptType(),
+                  entity.getConvertTbel(),
+                  argNames)
+              .get();
     }
     System.out.printf("UUID:" + scriptUUID.toString());
   }
   @Override
   public void release(String tenantId, String scriptId) {
-    TkDeviceScriptEntity entity = baseMapper.selectOne(new LambdaQueryWrapper<TkDeviceScriptEntity>()
-            .eq(TkDeviceScriptEntity::getId,scriptId));
-    if(null == entity){
+    TkDeviceScriptEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDeviceScriptEntity>()
+                .eq(TkDeviceScriptEntity::getId, scriptId));
+    if (null == entity) {
       throw new TkDataValidationException("脚本不存在");
     }
-    if(Objects.equals(entity.getScriptLanguage(),ScriptLanguage.JS)){
+    if (Objects.equals(entity.getScriptLanguage(), ScriptLanguage.JS)) {
       jsInvokeService.release(UUID.fromString(scriptId));
     }
-    if(Objects.equals(entity.getScriptLanguage(),ScriptLanguage.TBEL)){
+    if (Objects.equals(entity.getScriptLanguage(), ScriptLanguage.TBEL)) {
       tbelInvokeService.release(UUID.fromString(scriptId));
     }
   }
   @Override
   public ScriptLanguage findScriptLanguageById(String scriptId) {
-    return Optional.ofNullable(baseMapper.selectById(scriptId)).map(entity->entity.getScriptLanguage()).orElse(null);
+    return Optional.ofNullable(baseMapper.selectById(scriptId))
+        .map(entity -> entity.getScriptLanguage())
+        .orElse(null);
   }
   @Override
   public List<TkDeviceScriptDTO> findAllEnabledScript() {
-    List<TkDeviceScriptEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceScriptEntity>().
-            eq(TkDeviceScriptEntity::getStatus,StatusEnum.ENABLE.getIndex())
-            .ne(TkDeviceScriptEntity::getTenantId,EntityId.NULL_UUID.toString()));
-    return Optional.ofNullable(entities).map(objects-> objects.stream().map(entity->entity.getDTO(TkDeviceScriptDTO.class))
-            .collect(Collectors.toList())).orElse(null);
+    //找到所有的租户
+    List<TenantDTO> tenants = tenantService.getAllTenant();
+    if(null == tenants || tenants.isEmpty()){
+      return null;
+    }
+    List<String> tenantIds = tenants.stream().map(entity->entity.getTenantId()).collect(Collectors.toList());
+    List<TkDeviceScriptEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceScriptEntity>()
+                .eq(TkDeviceScriptEntity::getStatus, StatusEnum.ENABLE.getIndex())
+                .in(TkDeviceScriptEntity::getTenantId, tenantIds));
+    return Optional.ofNullable(entities)
+        .map(
+            objects ->
+                objects.stream()
+                    .map(
+                        entity -> {
+                          TkDeviceScriptDTO scriptDTO = entity.getDTO(TkDeviceScriptDTO.class);
+                          scriptDTO.setScriptType(entity.getScriptType().name());
+                          return scriptDTO;
+                        })
+                    .collect(Collectors.toList()))
+        .orElse(null);
   }
-  private String modelHex(Integer max){
+  private String modelHex(Integer max) {
     String addrStr = ByteUtils.integerToHex(max);
-    return addrStr.substring(addrStr.length()-4);
+    return addrStr.substring(addrStr.length() - 4);
   }
-  private String dataLength(Integer max){
+  private String dataLength(Integer max) {
     String addrStr = ByteUtils.integerToHex(max);
-    return addrStr.substring(addrStr.length()-2);
+    return addrStr.substring(addrStr.length() - 2);
   }
-  private String multData(String functionCode,List<Integer>datas){
+
+  private String multData(String functionCode, List<Integer> datas) {
     StringBuilder dataStr = new StringBuilder();
     int dataLength = datas.size();
-    if(TkModBusFunctionCode.WRITE_MANY_REGISTER.getCode().equals(functionCode)){
-      dataStr.append(dataLength(dataLength*2));
-      for(Integer item: datas){
+    if (TkModBusFunctionCode.WRITE_MANY_REGISTER.getCode().equals(functionCode)) {
+      dataStr.append(dataLength(dataLength * 2));
+      for (Integer item : datas) {
         dataStr.append(modelHex(item));
       }
-    }else{
+    } else {
-      int residue = dataLength%8;
-      int num = dataLength/8;
-      dataStr.append(dataLength(residue == 0 ?num:num+1));
+      int residue = dataLength % 8;
+      int num = dataLength / 8;
+      dataStr.append(dataLength(residue == 0 ? num : num + 1));
-      Integer wordVal=0;
-      for(int dataIndex=0,wordIndex=0;dataIndex<dataLength;dataIndex++){
+      Integer wordVal = 0;
+      for (int dataIndex = 0, wordIndex = 0; dataIndex < dataLength; dataIndex++) {
         Integer itemVal = datas.get(dataIndex);
-        if(itemVal == 1){
+        if (itemVal == 1) {
           byte one = 1;
-          one<<=wordIndex;
-          wordVal+=one;
+          one <<= wordIndex;
+          wordVal += one;
         }
-        if(dataIndex%8==7 || dataLength == dataIndex+1){
+        if (dataIndex % 8 == 7 || dataLength == dataIndex + 1) {
           dataStr.append(ByteUtils.byteToHex(wordVal.byteValue()));
-          wordVal=0;
-          wordIndex=0;
-        }else{
+          wordVal = 0;
+          wordIndex = 0;
+        } else {
           wordIndex++;
         }
       }
--- a/dao/src/main/resources/mapper/TkDataViewMapper.xml
View file @e417d05
+++ b/dao/src/main/resources/mapper/TkDataViewMapper.xml
View file @e417d05
@@ -24,6 +24,7 @@
     <resultMap id="dataViewInfoMap"
                type="org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO">
+        <result property="thumbnail" column="thumbnail"/>
         <result property="dataViewId" column="id"/>
         <result property="dataViewName" column="name"/>
         <result property="state" column="state"/>
@@ -61,7 +62,7 @@
     </select>
     <select id="getDataViewInfoById" resultMap="dataViewInfoMap">
-        SELECT icc.id,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN
+        SELECT icc.id,icc.thumbnail,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN
         tk_data_view_content icct ON icc.id = icct.view_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>
--- a/transport/gbt28181/src/main/java/org/thingsboard/server/gbt28181/ThingsboardGBT28181TransportApplication.java
View file @e417d05
+++ b/transport/gbt28181/src/main/java/org/thingsboard/server/gbt28181/ThingsboardGBT28181TransportApplication.java
View file @e417d05
@@ -17,6 +17,7 @@ package org.thingsboard.server.gbt28181;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -26,6 +27,7 @@ import java.util.Arrays;
 @SpringBootConfiguration
 @EnableAsync
 @EnableScheduling
+@EnableAutoConfiguration
 @ComponentScan({"org.thingsboard.server.gbt28181", "org.thingsboard.server.common", "org.thingsboard.server.transport.gbt28181", "org.thingsboard.server.queue", "org.thingsboard.server.cache"})
 public class ThingsboardGBT28181TransportApplication {
--- a/transport/tcp/src/main/java/org/thingsboard/server/tcp/ThingsboardTcpTransportApplication.java
View file @e417d05
+++ b/transport/tcp/src/main/java/org/thingsboard/server/tcp/ThingsboardTcpTransportApplication.java
View file @e417d05
@@ -17,6 +17,7 @@ package org.thingsboard.server.tcp;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -26,7 +27,8 @@ import java.util.Arrays;
 @SpringBootConfiguration
 @EnableAsync
 @EnableScheduling
-@ComponentScan({"org.thingsboard.server.tcp", "org.thingsboard.server.common", "org.thingsboard.server.transport.tcp", "org.thingsboard.server.transport.udp", "org.thingsboard.server.queue", "org.thingsboard.server.cache"})
+@EnableAutoConfiguration
+@ComponentScan({"org.thingsboard.server.tcp", "org.thingsboard.server.common", "org.thingsboard.server.transport.tcp", "org.thingsboard.server.queue", "org.thingsboard.server.cache","org.thingsboard.script.api"})
 public class ThingsboardTcpTransportApplication {
     private static final String SPRING_CONFIG_NAME_KEY = "--spring.config.name";