Merge branch '20230411' into 'master_dev'

fix: 产品模块，传输协议那里可用脚本需要返回系统自带的脚本

See merge request yunteng/thingskit!172

@@ -57,8 +57,11 @@ import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 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.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.PublicCustomerDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
@@ -243,6 +246,10 @@ public abstract class BaseController {
     @Getter
     protected boolean edgesEnabled;
 
+    //thingskit
+    @Autowired
+    private CacheUtils cacheUtils;
+
     @ExceptionHandler(ThingsboardException.class)
     public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
         errorResponseHandler.handle(ex, response);
@@ -888,7 +895,6 @@ public abstract class BaseController {
      * 构建设备配置的配置数据
      * @param transportType            产品的通信协议
      * @param deviceProfileData        空的设备配置数据
-     * @return
      */
     protected DeviceProfileData buildDeviceProfileData(String transportType,DeviceProfileData deviceProfileData) {
         if(null == deviceProfileData){
@@ -949,4 +955,27 @@ public abstract class BaseController {
                 getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
         return savedDeviceProfile;
     }
+
+    /**
+     * 获取租户的公共ID并设置缓存
+     * @param tenantId 租户ID
+     * @return 公共ID
+     */
+    private String findPublicCustomerId(TenantId tenantId){
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        String cacheKey =
+                FastIotConstants.CacheConfigKey.PUBLIC_ID + tenantId.getId().toString();
+        Optional<String> publicId = cacheUtils.get(cacheKey);
+        return publicId.orElseGet(
+                () -> Optional.ofNullable(customerService.findOrCreatePublicCustomer(tenantId)).
+                            map(customer -> customer.getId().getId().toString()).orElse(null));
+    }
+
+    protected void setPublicCustomerIdToCache(PublicCustomerDTO dto) throws ThingsboardException {
+        String publicCustomerId = findPublicCustomerId(getTenantId());
+        if (Objects.equals(dto.getViewType(), ViewType.PUBLIC_VIEW)
+              && !StringUtils.isEmpty(publicCustomerId)) {
+            dto.setPublicId(publicCustomerId);
+        }
+    }
 }

@@ -8,10 +8,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
@@ -31,7 +34,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class TkConfigurationCenterController extends BaseController {
 
-  private final TkConfigurationCenterService ytConfigurationCenterService;
+  private final TkConfigurationCenterService tkConfigurationCenterService;
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页")
@@ -62,8 +65,15 @@ public class TkConfigurationCenterController extends BaseController {
     if (null != orderType) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    queryMap.put("userId",getCurrentUser().getCurrentUserId());
-    return ytConfigurationCenterService.page(queryMap, getCurrentUser().isTenantAdmin());
+    queryMap.put("userId", getCurrentUser().getCurrentUserId());
+    TkPageData<ConfigurationCenterDTO> pageData =
+        tkConfigurationCenterService.page(queryMap, getCurrentUser().isTenantAdmin());
+    if (!pageData.getItems().isEmpty()) {
+      for (ConfigurationCenterDTO dto : pageData.getItems()) {
+        setPublicCustomerIdToCache(dto);
+      }
+    }
+    return pageData;
   }
 
   @PostMapping
@@ -75,7 +85,7 @@ public class TkConfigurationCenterController extends BaseController {
       throws ThingsboardException {
     configurationCenterDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(
-        ytConfigurationCenterService.saveConfiguration(configurationCenterDTO));
+        tkConfigurationCenterService.saveConfiguration(configurationCenterDTO));
   }
 
   @PutMapping
@@ -87,7 +97,7 @@ public class TkConfigurationCenterController extends BaseController {
       throws ThingsboardException {
     configurationCenterDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(
-        ytConfigurationCenterService.updateConfiguration(configurationCenterDTO));
+        tkConfigurationCenterService.updateConfiguration(configurationCenterDTO));
   }
 
   @DeleteMapping
@@ -98,17 +108,34 @@ public class TkConfigurationCenterController extends BaseController {
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseEntity.ok(ytConfigurationCenterService.deleteConfigurationCenter(deleteDTO));
+    return ResponseEntity.ok(tkConfigurationCenterService.deleteConfigurationCenter(deleteDTO));
   }
 
   @GetMapping("/get_configuration_info/{id}")
   @ApiOperation("获取组态信息")
   @PreAuthorize(
-      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:get_configuration_info:design','api:yt:configuration:center:get_configuration_info:preview'})")
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:get_configuration_info:design'"
+          + ",'api:yt:configuration:center:get_configuration_info:preview'})")
   public ResponseEntity<ConfigurationContentInfoDTO> getConfigurationInfos(
       @PathVariable("id") String id) throws ThingsboardException {
     return ResponseEntity.ok(
-        ytConfigurationCenterService.getConfigurationInfos(
+        tkConfigurationCenterService.getConfigurationInfos(
             id, getCurrentUser().getCurrentTenantId()));
   }
+
+  @PostMapping("share/{id}")
+  @ApiOperation("分享")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:configuration:center:share'})")
+  public ResponseEntity<Boolean> share(
+      @PathVariable("id") String id,
+      @RequestParam(value = "accessCredentials", required = false) String accessCredentials,
+      @RequestParam(value = "isShare") boolean isShare)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(id)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(
+        tkConfigurationCenterService.shareOrMonopolyConfigurationCenter(
+            isShare, id, accessCredentials, getCurrentUser().getCurrentTenantId()));
+  }
 }

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,9 +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.TkDataBoardService;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -35,7 +34,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 @Api(tags = {"数据看板"})
 public class TkDataBoardController extends BaseController {
-  private final TkDataBoardService ytDataBoardService;
+  private final TkDataBoardService tkDataBoardService;
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
@@ -59,22 +58,31 @@ public class TkDataBoardController extends BaseController {
     if (StringUtils.isNotBlank(name)) {
       queryMap.put("name", name);
     }
-    queryMap.put("userId",getCurrentUser().getCurrentUserId());
-    return ytDataBoardService.dataBoardPage(queryMap, getCurrentUser().isTenantAdmin());
+    queryMap.put("userId", getCurrentUser().getCurrentUserId());
+    TkPageData<DataBoardDTO> pageData =
+        tkDataBoardService.dataBoardPage(queryMap, getCurrentUser().isTenantAdmin());
+    if(!pageData.getItems().isEmpty()){
+      for (DataBoardDTO dto : pageData.getItems()) {
+        setPublicCustomerIdToCache(dto);
+      }
+    }
+    return pageData;
   }
 
   @DeleteMapping
   @ApiOperation(value = "删除数据看板")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:delete'})")
   public ResponseResult<Boolean> deleteDataBoard(
       @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseResult.success(ytDataBoardService.deleteDataBoard(deleteDTO));
+    return ResponseResult.success(tkDataBoardService.deleteDataBoard(deleteDTO));
   }
 
   @PostMapping("/add")
   @ApiOperation(value = "新增数据看板")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:add:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:add:post'})")
   public ResponseResult<DataBoardDTO> save(
       @RequestBody @Validated(AddGroup.class) DataBoardDTO dataBoard)
       throws SchedulerException, ThingsboardException {
@@ -85,7 +93,8 @@ public class TkDataBoardController extends BaseController {
   }
 
   @PostMapping("/update")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:update:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:data_board:update:update'})")
   @ApiOperation(value = "编辑数据看板")
   public ResponseResult<DataBoardDTO> update(
       @RequestBody @Validated(UpdateGroup.class) DataBoardDTO dataBoard)
@@ -102,13 +111,29 @@ public class TkDataBoardController extends BaseController {
       @PathVariable("boardId") String boardId, @RequestBody List<ComponentLayoutDTO> layoutDTOList)
       throws ThingsboardException {
     return ResponseResult.success(
-        ytDataBoardService.saveComponentLayout(
+        tkDataBoardService.saveComponentLayout(
             layoutDTOList, boardId, getCurrentUser().getCurrentTenantId()));
   }
 
+  @PostMapping("share/{id}")
+  @ApiOperation("分享")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:data_board:share'})")
+  public ResponseEntity<Boolean> share(
+      @PathVariable("id") String id,
+      @RequestParam(value = "accessCredentials", required = false) String accessCredentials,
+      @RequestParam(value = "isShare") boolean isShare)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(id)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(
+        tkDataBoardService.shareOrMonopolyDataBoard(
+            isShare, id, accessCredentials, getCurrentUser().getCurrentTenantId()));
+  }
+
   private ResponseResult<DataBoardDTO> saveOrUpdate(DataBoardDTO dataBoard)
       throws ThingsboardException {
     dataBoard.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseResult.success(ytDataBoardService.saveOrUpdateDataBoard(dataBoard));
+    return ResponseResult.success(tkDataBoardService.saveOrUpdateDataBoard(dataBoard));
   }
 }

@@ -12,6 +12,8 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TkDataViewDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
@@ -31,103 +33,125 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("/api/yt/data_view")
 @RequiredArgsConstructor
 @Api(tags = "大屏设计器")
-@PreAuthorize("@check.checkPermissions({},{})")
+@PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class TkDataViewController extends BaseController {
 
-    private final TkDataViewService tkDataViewService;
+  private final TkDataViewService tkDataViewService;
 
-    @GetMapping(params = {PAGE_SIZE, PAGE})
-    @ApiOperation("分页")
-    public TkPageData<TkDataViewDTO> page(
-            @RequestParam(PAGE_SIZE) int pageSize,
-            @RequestParam(PAGE) int page,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "state", required = false) String state,
-            @RequestParam(value = "organizationId", required = false) String organizationId,
-            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
-            throws ThingsboardException {
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public TkPageData<TkDataViewDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "state", required = false) String state,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
 
-        HashMap<String, Object> queryMap = new HashMap<>();
-        queryMap.put(PAGE_SIZE, pageSize);
-        queryMap.put(PAGE, page);
-        queryMap.put(ORDER_FILED, orderBy);
-        queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
-        if (StringUtils.isNotBlank(name)) {
-            queryMap.put("name", name);
-        }
-        if (StringUtils.isNotBlank(organizationId)) {
-            queryMap.put("organizationId", organizationId);
-        }
-        if (StringUtils.isNotBlank(state)) {
-            queryMap.put("state", state);
-        }
-        if (null != orderType) {
-            queryMap.put(ORDER_TYPE, orderType.name());
-        }
-        queryMap.put("userId", getCurrentUser().getCurrentUserId());
-        return tkDataViewService.page(queryMap, getCurrentUser().isTenantAdmin());
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
+    if (StringUtils.isNotBlank(name)) {
+      queryMap.put("name", name);
     }
-
-    @PostMapping
-    @ApiOperation("新增")
-    @PreAuthorize(
-            "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:post'})")
-    public ResponseEntity<TkDataViewDTO> save(
-            @Validated({AddGroup.class}) @RequestBody TkDataViewDTO TkDataViewDTO)
-            throws ThingsboardException {
-        TkDataViewDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return ResponseEntity.ok(
-                tkDataViewService.saveDataView(TkDataViewDTO));
+    if (StringUtils.isNotBlank(organizationId)) {
+      queryMap.put("organizationId", organizationId);
     }
-
-    @PutMapping
-    @ApiOperation("修改")
-    @PreAuthorize(
-            "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:update'})")
-    public ResponseEntity<TkDataViewDTO> update(
-            @Validated({UpdateGroup.class}) @RequestBody TkDataViewDTO TkDataViewDTO)
-            throws ThingsboardException {
-        TkDataViewDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return ResponseEntity.ok(
-                tkDataViewService.updateDataView(TkDataViewDTO));
+    if (StringUtils.isNotBlank(state)) {
+      queryMap.put("state", state);
     }
-
-    @DeleteMapping
-    @ApiOperation("删除")
-    @PreAuthorize(
-            "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:delete'})")
-    public ResponseEntity<Boolean> delete(
-            @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
-            throws ThingsboardException {
-        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return ResponseEntity.ok(tkDataViewService.deleteDataView(deleteDTO));
+    if (null != orderType) {
+      queryMap.put(ORDER_TYPE, orderType.name());
     }
-
-    @GetMapping("/get_configuration_info/{id}")
-    @ApiOperation("获取大屏信息")
-    @PreAuthorize(
-            "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:get_dataview_info:design','api:yt:dataview:center:get_dataview_info:preview'})")
-    public ResponseEntity<TkDataViewContentInfoDTO> getConfigurationInfos(
-            @PathVariable("id") String id) throws ThingsboardException {
-        return ResponseEntity.ok(
-                tkDataViewService.getDataViewInfos(
-                        id, getCurrentUser().getCurrentTenantId()));
+    queryMap.put("userId", getCurrentUser().getCurrentUserId());
+    TkPageData<TkDataViewDTO> pageData =  tkDataViewService.page(queryMap, getCurrentUser().isTenantAdmin());
+    if(!pageData.getItems().isEmpty()){
+      for(TkDataViewDTO dto : pageData.getItems()){
+        setPublicCustomerIdToCache(dto);
+      }
     }
+    return pageData;
+  }
 
-    @GetMapping("/publish/{id}")
-    @ApiOperation("发布")
-    @PreAuthorize("@check.checkPermissions({},{})")
-    public ResponseEntity<Boolean> publishDataView(@PathVariable("id") String id) throws ThingsboardException {
-        return ResponseEntity.ok(
-                tkDataViewService.publishDataView(id, getCurrentUser().getCurrentTenantId()));
-    }
+  @PostMapping
+  @ApiOperation("新增")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:post'})")
+  public ResponseEntity<TkDataViewDTO> save(
+      @Validated({AddGroup.class}) @RequestBody TkDataViewDTO TkDataViewDTO)
+      throws ThingsboardException {
+    TkDataViewDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(tkDataViewService.saveDataView(TkDataViewDTO));
+  }
+
+  @PutMapping
+  @ApiOperation("修改")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:update'})")
+  public ResponseEntity<TkDataViewDTO> update(
+      @Validated({UpdateGroup.class}) @RequestBody TkDataViewDTO TkDataViewDTO)
+      throws ThingsboardException {
+    TkDataViewDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(tkDataViewService.updateDataView(TkDataViewDTO));
+  }
+
+  @DeleteMapping
+  @ApiOperation("删除")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:delete'})")
+  public ResponseEntity<Boolean> delete(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(tkDataViewService.deleteDataView(deleteDTO));
+  }
+
+  @GetMapping("/get_configuration_info/{id}")
+  @ApiOperation("获取大屏信息")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:get_dataview_info:design',"
+          + "'api:yt:dataview:center:get_dataview_info:preview'})")
+  public ResponseEntity<TkDataViewContentInfoDTO> getConfigurationInfos(
+      @PathVariable("id") String id) throws ThingsboardException {
+    return ResponseEntity.ok(
+        tkDataViewService.getDataViewInfos(id, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @GetMapping("/publish/{id}")
+  @ApiOperation("发布")
+  @PreAuthorize("@check.checkPermissions({},{})")
+  public ResponseEntity<Boolean> publishDataView(@PathVariable("id") String id)
+      throws ThingsboardException {
+    return ResponseEntity.ok(
+        tkDataViewService.publishDataView(id, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @GetMapping("/cancel_publish/{id}")
+  @ApiOperation("取消发布")
+  @PreAuthorize("@check.checkPermissions({},{})")
+  public ResponseEntity<Boolean> cancelPublishDataView(@PathVariable("id") String id)
+      throws ThingsboardException {
+    return ResponseEntity.ok(
+        tkDataViewService.cancelPublishDataView(id, getCurrentUser().getCurrentTenantId()));
+  }
 
-    @GetMapping("/cancel_publish/{id}")
-    @ApiOperation("取消发布")
-    @PreAuthorize("@check.checkPermissions({},{})")
-    public ResponseEntity<Boolean> cancelPublishDataView(@PathVariable("id") String id) throws ThingsboardException {
-        return ResponseEntity.ok(
-                tkDataViewService.cancelPublishDataView(id, getCurrentUser().getCurrentTenantId()));
+  @PostMapping("share/{id}")
+  @ApiOperation("分享")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:dataview:center:share'})")
+  public ResponseEntity<Boolean> share(
+      @PathVariable("id") String id,
+      @RequestParam(value = "accessCredentials", required = false) String accessCredentials,
+      @RequestParam(value = "isShare") boolean isShare)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(id)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+    return ResponseEntity.ok(
+        tkDataViewService.shareOrMonopolyDataViewCenter(
+            isShare, id, accessCredentials, getCurrentUser().getCurrentTenantId()));
+  }
 }

@@ -30,6 +30,7 @@ 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.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceRpcDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
@@ -154,9 +155,9 @@ public class TkDeviceScriptController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping("/me/list")
     @ApiOperation("选项列表")
-    public ResponseEntity listDeviceScript() throws ThingsboardException {
+    public ResponseEntity listDeviceScript(@RequestParam(value = "scriptType", required = false) TkScriptFunctionType scriptType) throws ThingsboardException {
         List<TkDeviceScriptDTO> results =
-                scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId());
+                scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId(),scriptType);
         return ResponseEntity.ok(results);
     }
 
@@ -217,6 +218,17 @@ public class TkDeviceScriptController extends BaseController {
         }
     }
 
+
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+    @PostMapping("/modbus")
+    @ApiOperation("生成Modbus指令")
+    public ResponseEntity<String> modbus(@RequestBody TkDeviceRpcDTO inputParams)
+            throws ThingsboardException {
+            return ResponseEntity.ok(scriptService.modbus(inputParams));
+    }
+
+
     /**
      * 构造调用TBDeviceProfile需要的参数
      *

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.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;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/share")
+@Api(tags = {"分享的视图"})
+public class TkShareViewController extends BaseController {
+  private final TkShareViewService tkShareViewService;
+
+  @GetMapping("/check/{type}/{viewId}")
+  @ApiOperation(value = "检查分享视图是否需要访问凭证")
+  public ResponseResult<Boolean> checkPublicViewNeedCredentials(
+      @PathVariable("type") ShareViewType type, @PathVariable("viewId") String viewId)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(viewId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(
+        tkShareViewService.checkPublicViewNeedCredentials(
+            type, viewId, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @GetMapping("/{share_view_type}/share_data/{id}")
+  @ApiOperation(value = "查看分享的数据")
+  public ResponseResult<Object> viewDataComponentsByBoardId(
+      @PathVariable("id") String id,
+      @PathVariable("share_view_type") ShareViewType shareViewType,
+      @RequestParam(value = "accessCredentials",required = false) String accessCredentials)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(id) || null == shareViewType) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(
+        tkShareViewService.viewShareDataById(
+            shareViewType, id, accessCredentials, getCurrentUser().getCurrentTenantId()));
+  }
+}

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.quartz.SchedulerException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+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 java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequestMapping("api/yt/task_center")
+@Api(tags = {"任务中心"})
+@RequiredArgsConstructor
+public class TkTaskCenterController extends BaseController {
+  private final TkTaskCenterService tkTaskCenterService;
+
+  @GetMapping(
+      name = "page",
+      params = {PAGE_SIZE, PAGE})
+  public TkPageData<TkTaskCenterDTO> pageDevice(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "state", required = false) Integer state,
+      @RequestParam(value = "targetType", required = false) TargetTypeEnum targetType,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put(ORDER_TYPE, orderType);
+    queryMap.put("state", state);
+    queryMap.put("targetType", targetType);
+    return tkTaskCenterService.taskCenterPage(queryMap, getCurrentUser().getCurrentTenantId());
+  }
+
+  @PostMapping("/add")
+  @ApiOperation(value = "新增任务中心")
+//  @PreAuthorize(
+//      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:add:post'})")
+  public ResponseResult<TkTaskCenterDTO> save(
+      @RequestBody @Validated(AddGroup.class) TkTaskCenterDTO taskCenter)
+      throws ThingsboardException, SchedulerException {
+    if (StringUtils.isNotEmpty(taskCenter.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(saveOrUpdate(taskCenter));
+  }
+
+  @PutMapping("/update")
+//  @PreAuthorize(
+//      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:update'})")
+  @ApiOperation(value = "编辑任务中心")
+  public ResponseResult<TkTaskCenterDTO> update(
+      @RequestBody @Validated(UpdateGroup.class) TkTaskCenterDTO taskCenter)
+      throws ThingsboardException, SchedulerException {
+    if (StringUtils.isEmpty(taskCenter.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(saveOrUpdate(taskCenter));
+  }
+
+  @PutMapping("/{id}/update/{state}")
+//  @PreAuthorize(
+//      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:update:update'})")
+  @ApiOperation(value = "更新状态")
+  public ResponseResult<Boolean> updateState(
+      @PathVariable("id") String id, @PathVariable("state") Integer state)
+      throws ThingsboardException, SchedulerException {
+    if (StringUtils.isEmpty(id) || null == state) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(
+        tkTaskCenterService.updateState(id, state, getCurrentUser().getCurrentTenantId()));
+  }
+
+  @DeleteMapping
+//  @PreAuthorize(
+//      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:delete'})")
+  @ApiOperation(value = "删除任务中心")
+  public ResponseResult<Boolean> deleteTaskCenter(@RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException, SchedulerException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseResult.success(tkTaskCenterService.deleteTaskCenter(deleteDTO));
+  }
+
+  @PutMapping("/{id}/cancel/{tbDeviceId}")
+//  @PreAuthorize(
+//          "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:cancel'})")
+  @ApiOperation(value = "设备取消任务执行")
+  public ResponseResult<Boolean> cancelExecute(
+      @PathVariable("id") String taskId, @PathVariable("tbDeviceId") String tbDeviceId)throws ThingsboardException {
+    if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(tbDeviceId)){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseResult.success(
+        tkTaskCenterService.cancelExecute(
+            taskId, tbDeviceId, getCurrentUser().getCurrentTenantId()));
+  }
+
+  private TkTaskCenterDTO saveOrUpdate(TkTaskCenterDTO tkTaskCenterDTO)
+      throws ThingsboardException, SchedulerException {
+    tkTaskCenterDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return tkTaskCenterService.saveOrUpdateTaskCenter(tkTaskCenterDTO);
+  }
+}

+package org.thingsboard.server.utils.yunteng;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TargetContentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
+import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import java.util.*;
+
+@Component("rpcCommandTask")
+@RequiredArgsConstructor
+@Slf4j
+public class RpcCommandTask {
+  @Value("${server.rest.server_side_rpc.default_timeout:10000}")
+  protected long defaultTimeout;
+
+  @Value("${server.rest.server_side_rpc.min_timeout:5000}")
+  protected long minTimeout;
+
+  private final TkTaskCenterService tkTaskCenterService;
+  private final TbCoreDeviceRpcService tbCoreDeviceRpcService;
+  private final TkDeviceService tkDeviceService;
+  public void process(String taskCenterId) {
+    // 通过任务中心ID查询执行命令及执行对象
+    ListenableFuture<TkTaskCenterDTO> future =
+        tkTaskCenterService.getTaskCenterInfoById(taskCenterId);
+    Futures.addCallback(
+        future,
+        new FutureCallback<>() {
+          @Override
+          public void onSuccess(@Nullable TkTaskCenterDTO tkTaskCenterDTO) {
+            if (null != tkTaskCenterDTO) {
+              TargetTypeEnum targetType = tkTaskCenterDTO.getTargetType();
+              TargetContentDTO targetContent = tkTaskCenterDTO.getExecuteTarget();
+              JsonNode cmdJsonNode = tkTaskCenterDTO.getExecuteContent().getPushContent();
+              SecurityUser securityUser = new SecurityUser();
+              // send cmd
+              if (targetContent.getData() != null && null != cmdJsonNode) {
+                String tenantId = tkTaskCenterDTO.getTenantId();
+                if (targetType.equals(TargetTypeEnum.DEVICES)) {
+                  for (String deviceId : targetContent.getData()) {
+                    sendRpcCommand(cmdJsonNode, tenantId, deviceId, securityUser);
+                  }
+                } else {
+                  sendRpcCommandByProducts(targetContent, cmdJsonNode, tenantId, securityUser);
+                }
+              }
+            }
+          }
+
+          @Override
+          public void onFailure(@NotNull Throwable throwable) {}
+        },
+        MoreExecutors.directExecutor());
+  }
+
+  private void sendRpcCommandByProducts(
+      TargetContentDTO targetContent,
+      JsonNode cmdJsonNode,
+      String tenantId,
+      SecurityUser securityUser) {
+    for (String deviceProfileId : targetContent.getData()) {
+      Futures.addCallback(
+          tkDeviceService.findDeviceListByDeviceProfileId(deviceProfileId, tenantId),
+          new FutureCallback<List<DeviceDTO>>() {
+            @Override
+            public void onSuccess(@Nullable List<DeviceDTO> deviceDTOS) {
+              if (null != deviceDTOS && !deviceDTOS.isEmpty()) {
+                for (DeviceDTO dto : deviceDTOS) {
+                  Map<String, List<String>> map = targetContent.getCancelExecuteDevices();
+                  boolean needSendCommand = true;
+                  if (null != map && !map.isEmpty() && !map.get(deviceProfileId).isEmpty()) {
+                    for (String deviceId : map.get(deviceProfileId)) {
+                      if (Objects.equals(deviceId, dto.getTbDeviceId())) {
+                        needSendCommand = false;
+                        break;
+                      }
+                    }
+                  }
+                  if (needSendCommand) {
+                    sendRpcCommand(cmdJsonNode, tenantId, dto.getTbDeviceId(), securityUser);
+                  }
+                }
+              }
+            }
+
+            @Override
+            public void onFailure(@NotNull Throwable throwable) {}
+          },
+          MoreExecutors.directExecutor());
+    }
+  }
+
+  private void sendRpcCommand(
+      JsonNode cmdJsonNode, String tenantId, String originateId, SecurityUser securityUser) {
+    JsonNode rpcCommand = cmdJsonNode.get(FastIotConstants.RPC_COMMAND);
+    ToDeviceRpcRequestBody body =
+        new ToDeviceRpcRequestBody("methodThingskit", JacksonUtil.toString(rpcCommand));
+    DeviceId deviceId = new DeviceId(UUID.fromString(originateId));
+    ToDeviceRpcRequest request =
+        new ToDeviceRpcRequest(
+            UUID.randomUUID(),
+            new TenantId(UUID.fromString(tenantId)),
+            deviceId,
+            true,
+            System.currentTimeMillis() + Math.max(minTimeout, defaultTimeout),
+            body,
+            false,
+            null,
+            null);
+    tbCoreDeviceRpcService.processRestApiRpcRequest(
+        request,
+        fromDeviceRpcResponse -> {
+          log.trace("Device renamed RPC with id: [{}] ", request.getId());
+        },
+        securityUser);
+  }
+}

@@ -431,18 +431,20 @@ caffeine:
       timeToLiveInMinutes: "${CACHE_SPECS_EDGES_TTL:1440}"
       maxSize: "${CACHE_SPECS_EDGES_MAX_SIZE:10000}"
     yunTengIotCache:
-      timeToLiveInMinutes: 1440
-      maxSize: 10000
+      timeToLiveInMinutes: "${CACHE_SPECS_YUN_TENG_IOT_CACHE_TTL:1440}"
+      maxSize: "${CACHE_SPECS_YUN_TENG_IOT_CACHE_MAX_SIZE:10000}"
     userPermissionFor:
-      timeToLiveInMinutes: 1440
-      maxSize: 10000
+      timeToLiveInMinutes: "${CACHE_SPECS_USER_PERMISSION_FOR_TTL:1440}"
+      maxSize: "${CACHE_SPECS_USER_PERMISSION_FOR_MAX_SIZE:10000}"
     mobileLoginSmsCode:
-      timeToLiveInMinutes: 2
-      maxSize: 10000
+      timeToLiveInMinutes: "${CACHE_SPECS_MOBILE_LOGIN_SMS_CODE_TTL:2}"
+      maxSize: "${CACHE_SPECS_MOBILE_LOGIN_SMS_CODE_MAX_SIZE:10000}"
     thingsArea:
-      timeToLiveInMinutes: 1440
-      maxSize: 500
-
+      timeToLiveInMinutes: "${CACHE_SPECS_THINGS_AREA_TTL:1440}"
+      maxSize: "${CACHE_SPECS_THINGS_AREA_MAX_SIZE:500}"
+    taskCenterInfos:
+      timeToLiveInMinutes: "${CACHE_SPECS_TASK_CENTER_TTL:1440}"
+      maxSize: "${CACHE_SPECS_TASK_CENTER_MAX_SIZE:10000}"
 redis:
   # standalone or cluster
   connection:
@@ -905,8 +907,8 @@ transport:
     psm_activity_timer: "${LWM2M_PSM_ACTIVITY_TIMER:10000}"
     paging_transmission_window: "${LWM2M_PAGING_TRANSMISSION_WINDOW:10000}"
     network_config: # In this section you can specify custom parameters for LwM2M network configuration and expose the env variables to configure outside
-#      - key: "PROTOCOL_STAGE_THREAD_COUNT"
-#        value: "${LWM2M_PROTOCOL_STAGE_THREAD_COUNT:4}"
+  #      - key: "PROTOCOL_STAGE_THREAD_COUNT"
+  #        value: "${LWM2M_PROTOCOL_STAGE_THREAD_COUNT:4}"
   snmp:
     enabled: "${SNMP_ENABLED:true}"
     response_processing:
@@ -989,9 +991,9 @@ queue:
       tb_ota_package:
         - key: max.poll.records
           value: "${TB_QUEUE_KAFKA_OTA_MAX_POLL_RECORDS:10}"
-#      tb_rule_engine.sq:
-#        - key: max.poll.records
-#          value: "${TB_QUEUE_KAFKA_SQ_MAX_POLL_RECORDS:1024}"
+    #      tb_rule_engine.sq:
+    #        - key: max.poll.records
+    #          value: "${TB_QUEUE_KAFKA_SQ_MAX_POLL_RECORDS:1024}"
     other: # In this section you can specify custom parameters for Kafka consumer/producer and expose the env variables to configure outside
       - key: "request.timeout.ms" # refer to https://docs.confluent.io/platform/current/installation/configuration/producer-configs.html#producerconfigs_request.timeout.ms
         value: "${TB_QUEUE_KAFKA_REQUEST_TIMEOUT_MS:30000}" # (30 seconds)
@@ -1193,14 +1195,14 @@ file:
       staticUrl: /static/files/**              #oss静态访问路径 只有type = local需要
       randomFileName: ${file.storage.randomFileName}
     minio:
-      minioUrl: ${MINIO_URL:https://dev.thingskit.com:9000}  #minio储存地址
-      minioName: ${MINIO_NAME:test}                    #minio账户
-      minioPass: ${MINIO_PWD:test}              #minio访问密码
-      bucketName: yunteng                   #minio储存桶名称
+      minioUrl: ${MINIO_URL:http://localhost:9000}  #minio储存地址
+      minioName: ${MINIO_NAME:thingskit}                    #minio账户
+      minioPass: ${MINIO_PWD:thingskit}             #minio访问密码
+      bucketName: yunteng                #minio储存桶名称
       randomFileName: ${file.storage.randomFileName}
 account:
   info:
-    emailSuffix: ${ACCOUNT_EMAIL_SUFFIX:yunteng.com}
+    emailSuffix: ${ACCOUNT_EMAIL_SUFFIX:thingskit.com}
     defaultPassword: 123456
     reset: ${ACCOUNT_PASSWORD_FORCE_RESET:true}
 third:

@@ -19,13 +19,17 @@ public interface FastIotConstants {
   Pattern EMAIL_PATTERN = Pattern.compile(EMAIL, Pattern.CASE_INSENSITIVE);
   Pattern CHINA_MOBILE_PATTERN = Pattern.compile(MOBILE);
   String DEFAULT_DELIMITER = "#";
+  String RPC_COMMAND = "rpcCommand";
+
   interface CacheConfigKey {
     String CACHE_CONFIG_KEY = "yunTengIotCache";
     String USER_PERMISSION_PREFIX = "userPermissionFor_";
     String MOBILE_LOGIN_SMS_CODE = "mobileLoginSmsCode";
-
     String AREA = "thingsArea";
+    String PUBLIC_ID = "publicId_";
+    String TASK_CENTER_INFOS = "taskCenterInfos_";
   }
+
   interface TBCacheConfig {
     String TB_CACHE_CONFIG_KEY = "TB_CONNECT_CACHE";
     String EXISTING_TENANT = "EXISTING_TENANT";
@@ -48,7 +52,6 @@ public interface FastIotConstants {
     int DRAFT = 0;
   }
 
-
   interface ConfigureLevel {
     String CONFIGURE = "CONFIGURE";
     String CONTENT = "CONTENT";
@@ -130,6 +133,12 @@ public interface FastIotConstants {
     /** 在线 */
     public static final int ONLINE = 1;
 
+    /** 发布 */
+    public static final int PUBLISH = 1;
+
+    /** 取消发布 */
+    public static final int CANCEL_PUBLISH = 0;
+
     /** 删除成功 */
     public static final String DELETE_SUCCESS = "删除成功";
 

@@ -118,6 +118,8 @@ public final class ModelConstants {
     public static final String TK_CUSTOMER_DEVICE_NAME = "tk_customer_device";
     /** 设备上下线记录表 */
     public static final String TK_DEVICE_STATE_LOG = "tk_device_state_log";
+    /** 任务中心表 */
+    public static final String TK_TASK_CENTER_NAME = "tk_task_center";
   }
 
   public static class TableFields {

@@ -2,13 +2,14 @@ package org.thingsboard.server.common.data.yunteng.core.cache;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import java.util.Objects;
 import java.util.Optional;
 
 @Component
 public class CacheUtils {
 
-  private final String COMMON_STORE_AREA = "yun-teng-iot-common";
+  private final String COMMON_STORE_AREA = FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY;
 
   private final CacheManager cacheManager;
 

@@ -89,6 +89,11 @@ public enum ErrorMessage {
   INVALID_TOPIC(400065,"无效Topic。"),
   BUCKET_NOT_CONFORM_RENAME_RULE(400066,"存储桶不符合命名规范！！"),
   MINIO_KEY_AND_SIGNATURE_ERROR(400067,"Minio签名不匹配！！"),
+  CURRENT_VIEW_IS_PRIVATE(400068,"当前视图为私有视图,拒绝访问！"),
+  CURRENT_URL_REQUIRES_PERMISSION(400069,"当前视图需要访问凭证或凭证验证失败！"),
+  SHARE_VIEW_TYPE_NOT_EXIST(400070,"分享视图类型不存在"),
+  DATA_STATE_ENABLE_NOT_DELETE(400071,"【%s】数据为启用状态不能删除！！"),
+  EXECUTE_COMMAND_IS_NULL(400072,"执行命令不能为空"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class ConfigurationCenterDTO extends TenantDTO {
+public class ConfigurationCenterDTO extends PublicCustomerDTO {
   @ApiModelProperty(value = "组态名称", required = true)
   @NotEmpty(
       message = "组态名称不能为空或空字符串",

@@ -5,14 +5,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
-import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class DataBoardDTO extends TenantDTO {
+public class DataBoardDTO extends PublicCustomerDTO {
   @ApiModelProperty(value = "数据看板名称", required = true)
   @NotEmpty(message = "数据看板名称不能为空或者空字符串", groups = AddGroup.class)
   private String name;
@@ -21,9 +20,6 @@ public class DataBoardDTO extends TenantDTO {
   @NotEmpty(message = "组织ID不能为空或者空字符串", groups = AddGroup.class)
   private String organizationId;
 
-  @ApiModelProperty(value = "视图类型")
-  private ViewType viewType = ViewType.PRIVATE_VIEW;
-
   @ApiModelProperty(value = "组件布局")
   private List<ComponentLayoutDTO> layout;
 

@@ -121,6 +121,8 @@ public class DeviceDTO extends TenantDTO {
   @ApiModelProperty(value = "启用/禁用")
   private boolean enable;
 
+  private JsonNode customerAdditionalInfo;
+
   public DeviceState getDeviceState() {
     if (lastOnlineTime == null) {
       return DeviceState.INACTIVE;

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
+
+@Data
+public class PublicCustomerDTO extends TenantDTO {
+  @ApiModelProperty(value = "分享公共ID")
+  private String publicId;
+
+  @ApiModelProperty(value = "视图类型")
+  private ViewType viewType = ViewType.PRIVATE_VIEW;
+
+  @ApiModelProperty(value = "访问凭证")
+  private String accessCredentials;
+}

@@ -11,33 +11,27 @@ import javax.validation.constraints.NotEmpty;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TkDataViewDTO extends TenantDTO {
-    @ApiModelProperty(value = "大屏名称", required = true)
-    @NotEmpty(
-            message = "大屏名称不能为空或空字符串",
-            groups = {UpdateGroup.class, AddGroup.class})
-    private String name;
+public class TkDataViewDTO extends PublicCustomerDTO {
+  @ApiModelProperty(value = "大屏名称", required = true)
+  @NotEmpty(
+      message = "大屏名称不能为空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
+  private String name;
 
-    @ApiModelProperty(value = "状态:0待发布 1发布")
-    private Integer state;
+  @ApiModelProperty(value = "状态:0待发布 1发布")
+  private Integer state;
 
-    @ApiModelProperty(value = "大屏描述")
-    private String remark;
+  @ApiModelProperty(value = "大屏描述")
+  private String remark;
 
-    @ApiModelProperty(value = "组织ID", required = true)
-    @NotEmpty(
-            message = "组织ID不能为空或空字符串",
-            groups = {UpdateGroup.class, AddGroup.class})
-    private String organizationId;
+  @ApiModelProperty(value = "组织ID", required = true)
+  @NotEmpty(
+      message = "组织ID不能为空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
+  private String organizationId;
 
-    @ApiModelProperty(value = "组态缩略图")
-    private String thumbnail;
+  @ApiModelProperty(value = "组态缩略图")
+  private String thumbnail;
 
-    private OrganizationDTO organizationDTO;
-
-    @ApiModelProperty(value = "视图类型")
-    private ViewType viewType;
-
-    @ApiModelProperty(value = "访问凭证")
-    private String accessCredentials;
+  private OrganizationDTO organizationDTO;
 }

@@ -5,24 +5,33 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 
 @Data
 public class TkDeviceRpcDTO implements Serializable {
 
-    @ApiModelProperty(value = "命令下发方法名、功能名")
-    @NotEmpty(message = "功能名不能为空或者空字符串")
+    @ApiModelProperty(value = "功能码，16进制",required = true)
+    @NotEmpty(message = "功能码不能为空或者空字符串")
     private String method;
 
-    @ApiModelProperty(value = "设备名称。添加设备时，设备名称的内容必须与脚本用到的设备标识一致。")
-    @NotEmpty(message = "设备名称不能为空或者空字符串")
+    @ApiModelProperty(value = "从设备地址码，16进制。添加设备时，设备名称的内容必须与脚本用到的设备标识一致。",required = true)
+    @NotEmpty(message = "从设备地址码不能为空或者空字符串")
     private String deviceCode;
 
-    @ApiModelProperty(value = "数据校验算法")
-    private String check;
+    @ApiModelProperty(value = "数据校验算法",required = true)
+    private String crc;
 
-    @ApiModelProperty(value = "数据相关信息，例如：寄存器地址和寄存器数")
+    @ApiModelProperty(value = "寄存器地址",required = true)
+    private Integer registerAddr;
+    @ApiModelProperty(value = "寄存器数量")
+    private Integer registerNum;
+
+
+
+
+    @ApiModelProperty(value = "寄存器值")
     @NotEmpty(message = "数据相关信息不能为空或者空字符串")
-    private Map<String, Object> params;
+    private List<Integer> registerVales;
 }

+package org.thingsboard.server.common.data.yunteng.dto.task;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class TargetContentDTO {
+  @ApiModelProperty(value = "执行的数据：目标类型如果是产品则为deviceProfileId,如果是设备则为tbDeviceId")
+  List<String> data;
+
+  @ApiModelProperty(value = "设备类型")
+  String deviceType;
+
+  @ApiModelProperty(value = "组织ID")
+  String organizationId;
+
+  @ApiModelProperty(value = "设备配置ID")
+  String deviceProfileId;
+
+  @ApiModelProperty(value = "取消执行的数据：只有目标类型是产品时才会有值,且List<String>里面为tbDeviceId")
+  Map<String, List<String>> cancelExecuteDevices;
+}

+package org.thingsboard.server.common.data.yunteng.dto.task;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.ExecuteTypeEnum;
+
+@Data
+public class TaskExecuteTimeDTO {
+
+  @ApiModelProperty(value = "执行类型")
+  private ExecuteTypeEnum type = ExecuteTypeEnum.CUSTOM;
+
+  @ApiModelProperty(value = "周期类型")
+  private String periodType;
+
+  @ApiModelProperty(value = "周期")
+  private String period;
+
+  @ApiModelProperty(value = "时间")
+  private String time;
+
+  @ApiModelProperty(value = "轮询单位：秒 分 时")
+  private String pollUnit;
+
+  @ApiModelProperty(value = "cron表达式")
+  private String cron;
+}

+package org.thingsboard.server.common.data.yunteng.dto.task;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.TaskTypeEnum;
+
+@Data
+public class TaskTypeDTO {
+  @ApiModelProperty(value = "类型")
+  private TaskTypeEnum type = TaskTypeEnum.CUSTOM;
+
+  @ApiModelProperty(value = "推送方式：MQTT TCP")
+  private String pushWay;
+
+  @ApiModelProperty(value = "推送内容：即下发的命令内容")
+  private JsonNode pushContent;
+}

+package org.thingsboard.server.common.data.yunteng.dto.task;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TkTaskCenterDTO extends TenantDTO {
+  @NotEmpty(message = "任务名称不能为空或空字符串", groups = AddGroup.class)
+  @ApiModelProperty(value = "任务名称")
+  private String name;
+
+  @ApiModelProperty(value = "目标类型")
+  private TargetTypeEnum targetType = TargetTypeEnum.DEVICES;
+
+  @NotNull(message = "执行目标不能为空", groups = AddGroup.class)
+  @ApiModelProperty(value = "执行目标")
+  private TargetContentDTO executeTarget;
+
+  @NotNull(message = "执行内容不能为空", groups = AddGroup.class)
+  @ApiModelProperty(value = "执行内容")
+  private TaskTypeDTO executeContent;
+
+  @ApiModelProperty(value = "执行时间")
+  @NotNull(message = "执行时间不能为空", groups = AddGroup.class)
+  private TaskExecuteTimeDTO executeTime;
+
+  @ApiModelProperty(value = "0禁用 1启用")
+  private Integer state = FastIotConstants.StateValue.DISABLE;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum ExecuteTypeEnum {
+  CUSTOM,
+  POLL
+}

@@ -3,5 +3,6 @@ package org.thingsboard.server.common.data.yunteng.enums;
 public enum JobGroupEnum {
   DEFAULT,
   SYSTEM,
-  REPORT
+  REPORT,
+  TASK_CENTER
 }

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum ShareViewType {
+    DATA_BOARD,
+    SCADA,
+    LARGE_SCREEN
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum TargetTypeEnum {
+  PRODUCTS,
+  DEVICES
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum TaskTypeEnum {
+  CUSTOM,
+  MODBUS_RTU
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 编码类型
+ */
+public enum TcpDataTypeEnum {
+    HEX,
+    JSON,
+    ASCII
+}

+package org.thingsboard.server.common.data.yunteng.utils;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.util.regex.Pattern;
+
+/**
+ * @Description :数据类型转换工具类
+ * 二进制的最高位是符号位，0表示正，1表示负。
+ * 负数采用二进制的补码表示，10进制转为二进制得到的是源码，将源码按位取反得到的是反码，反码加1得到补码
+ * <p>
+ * <p>
+ * *￥￥￥【基本数据类型】￥￥￥￥￥￥￥￥￥￥￥￥
+ * 1/8：boolean【1 位】
+ * 3/8：byte   【1个字节，8 位】
+ * 3/8：short  【2个字节，16位】
+ * 4/8：int    【4个字节，32位】
+ * 5/8：long   【8个字节，64位】
+ * 6/8：float  【4个字节，32位】
+ * 7/8：double 【8个字节，64位】
+ * 8/8：chart  【2个字节，16位】
+ * <p>
+ * <p>
+ * <p>
+ * *￥￥￥【位运算】￥￥￥￥￥￥￥￥￥￥￥￥
+ * 左移【<< n】：向左移动，左边高位舍弃，右边的低位补0，例如：2左移3位，结果为16
+ * 右移【>>n】：向右移动，右边的舍弃掉，左边补的值取决于原来最高位，原来是1就补1，原来是0就补0
+ * 无符号右移【>>>n】向右移动，右边的舍弃掉，左边补0。
+ * <p>
+ * <p>
+ * <p>
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Author: junlianglee
+ * @Date Created in 2019/12/11.
+ * @Modified by Administrator on 2019/12/11.
+ */
+public class ByteUtils {
+    public static final char[] ascii = "0123456789ABCDEF".toCharArray();
+    private static char[] HEX_VOCABLE = {'0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    public static final String UTF_8 = "UTF-8";
+
+    private static String hexString = "0123456789ABCDEF";
+
+    /**
+     * 将short整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(short data) {
+        byte[] bytes = new byte[2];
+        bytes[0] = (byte) ((data & 0xff00) >> 8);//1个十六进制位匹配4个二进制位
+        bytes[1] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将字符转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(char data) {
+        byte[] bytes = new byte[2];
+        bytes[0] = (byte) (data >> 8);
+        bytes[1] = (byte) (data);
+        return bytes;
+    }
+
+    /**
+     * 将布尔值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(boolean data) {
+        byte[] bytes = new byte[1];
+        bytes[0] = (byte) (data ? 1 : 0);
+        return bytes;
+    }
+
+    /**
+     * 将整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(int data) {
+        byte[] bytes = new byte[4];
+        bytes[0] = (byte) ((data & 0xff000000) >> 24);
+        bytes[1] = (byte) ((data & 0xff0000) >> 16);
+        bytes[2] = (byte) ((data & 0xff00) >> 8);
+        bytes[3] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将long整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(long data) {
+        byte[] bytes = new byte[8];
+        bytes[0] = (byte) ((data >> 56) & 0xff);
+        bytes[1] = (byte) ((data >> 48) & 0xff);
+        bytes[2] = (byte) ((data >> 40) & 0xff);
+        bytes[3] = (byte) ((data >> 32) & 0xff);
+        bytes[4] = (byte) ((data >> 24) & 0xff);
+        bytes[5] = (byte) ((data >> 16) & 0xff);
+        bytes[6] = (byte) ((data >> 8) & 0xff);
+        bytes[7] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将float型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(float data) {
+        int intBits = Float.floatToIntBits(data);
+        return getBytes(intBits);
+    }
+
+    /**
+     * 将double型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(double data) {
+        long intBits = Double.doubleToLongBits(data);
+        return getBytes(intBits);
+    }
+
+    /**
+     * 将字符串按照charsetName编码格式的字节数组
+     *
+     * @param data        字符串
+     * @param charsetName 编码格式
+     * @return
+     */
+    public static byte[] getBytes(String data, String charsetName) {
+        Charset charset = Charset.forName(charsetName);
+        return data.getBytes(charset);
+    }
+
+
+    /**
+     * 将字节数组前8字节转换为long整型数值
+     *
+     * @param bytes
+     * @return
+     */
+    public static long getLong(byte[] bytes) {
+        return (0xff00000000000000L & ((long) bytes[0] << 56)
+                | (0xff000000000000L & ((long) bytes[1] << 48))
+                | (0xff0000000000L & ((long) bytes[2] << 40))
+                | (0xff00000000L & ((long) bytes[3] << 32))
+                | (0xff000000L & ((long) bytes[4] << 24))
+                | (0xff0000L & ((long) bytes[5] << 16))
+                | (0xff00L & ((long) bytes[6] << 8))
+                | (0xffL & (long) bytes[7]));
+    }
+
+
+    /**
+     * 将charsetName编码格式的字节数组转换为字符串
+     *
+     * @param bytes
+     * @param charsetName
+     * @return
+     */
+    public static String getString(byte[] bytes, String charsetName) {
+        return new String(bytes, Charset.forName(charsetName));
+    }
+
+
+    public static byte[] hexStr2Bytes(String hexString) {
+        if (hexString == null || hexString.equals("")) {
+            return null;
+        }
+        // toUpperCase将字符串中的所有字符转换为大写
+        hexString = hexString.toUpperCase();
+        int length = hexString.length() / 2;// 2个16进制字符表示一个字节，所以字节数组长度是字符串长度除以2
+        // toCharArray将此字符串转换为一个新的字符数组。
+        char[] hexChars = hexString.toCharArray();
+        byte[] d = new byte[length];
+        for (int i = 0; i < length; i++) {
+            int pos = i * 2;
+            d[i] = (byte) (charToByte(hexChars[pos]) << 4
+                    | charToByte(hexChars[pos + 1]));
+        }
+        return d;
+    }
+
+    // charToByte返回在指定字符的第一个发生的字符串中的索引，即返回匹配字符
+    private static byte charToByte(char c) {
+        return (byte) "0123456789ABCDEF".indexOf(c);
+    }
+
+    /**
+     * 将16进制字符串转换为字节数组
+     *
+     * @param hex
+     * @return
+     */
+    public static byte[] hexToBytes(String hex) {
+        if (hex.length() % 2 != 0)
+            throw new IllegalArgumentException(
+                    "input string should be any multiple of 2!");
+        hex.toUpperCase();
+
+        byte[] byteBuffer = new byte[hex.length() / 2];
+
+        byte padding = 0x00;
+        boolean paddingTurning = false;
+        for (int i = 0; i < hex.length(); i++) {
+            if (paddingTurning) {
+                char c = hex.charAt(i);
+                int index = indexOf(hex, c);
+                padding = (byte) ((padding << 4) | index);
+                byteBuffer[i / 2] = padding;
+                padding = 0x00;
+                paddingTurning = false;
+            } else {
+                char c = hex.charAt(i);
+                int index = indexOf(hex, c);
+                padding = (byte) (padding | index);
+                paddingTurning = true;
+            }
+
+        }
+        return byteBuffer;
+    }
+
+    private static int indexOf(String input, char c) {
+        int index = ArrayUtils.indexOf(HEX_VOCABLE, c);
+
+        if (index < 0) {
+            throw new IllegalArgumentException("err input:" + input);
+        }
+        return index;
+
+    }
+
+    /**
+     * 字节数组转16进制字符串
+     *
+     * @param bs
+     * @return
+     */
+    public static String bytesToHex(byte[] bs) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bs) {
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+
+    private static final String messageRegular = "^[A-Za-z0-9!@#$%^&*()]+$";
+
+    public static String bytesToStr(byte[] bs) {
+        String result = getString(bs, ByteUtils.UTF_8);
+        if (!Pattern.compile(messageRegular).matcher(result).matches()) {
+            result = bytesToHex(bs);
+        }
+        return result;
+    }
+
+    public static byte[] strToBytes(String str) {
+        if (Pattern.compile(messageRegular).matcher(str).matches()) {
+            return hexStr2Bytes(str);
+        }
+        return getBytes(str, ByteUtils.UTF_8);
+    }
+
+    /**
+     * 字节数组取前len个字节转16进制字符串
+     *
+     * @param bs
+     * @param len
+     * @return
+     */
+    public static String bytesToHex(byte[] bs, int len) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            byte b = bs[i];
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 字节数组偏移offset长度之后的取len个字节转16进制字符串
+     *
+     * @param bs
+     * @param offset
+     * @param len
+     * @return
+     */
+    public static String bytesToHex(byte[] bs, int offset, int len) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            byte b = bs[offset + i];
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 字节数组转16进制字符串
+     *
+     * @param bs
+     * @return
+     */
+    public static String byteToHex(byte bs) {
+        StringBuilder sb = new StringBuilder();
+        int high = (bs >> 4) & 0x0f;
+        int low = bs & 0x0f;
+        sb.append(HEX_VOCABLE[high]);
+        sb.append(HEX_VOCABLE[low]);
+        return sb.toString();
+    }
+
+    /**
+     * 将字节数组取反
+     *
+     * @param src
+     * @return
+     */
+    public static String negate(byte[] src) {
+        if (src == null || src.length == 0) {
+            return null;
+        }
+        byte[] temp = new byte[2 * src.length];
+        for (int i = 0; i < src.length; i++) {
+            byte tmp = (byte) (0xFF ^ src[i]);
+            temp[i * 2] = (byte) ((tmp >> 4) & 0x0f);
+            temp[i * 2 + 1] = (byte) (tmp & 0x0f);
+        }
+        StringBuffer res = new StringBuffer();
+        for (int i = 0; i < temp.length; i++) {
+            res.append(ascii[temp[i]]);
+        }
+        return res.toString();
+    }
+
+
+    /**
+     * 数组合并
+     *
+     * @param before
+     * @param end
+     * @return
+     */
+    public static byte[] merge(byte[] before, byte[] end) {
+        byte[] result = new byte[before.length + end.length];
+        System.arraycopy(before, 0, result, 0, before.length);
+        System.arraycopy(end, 0, result, before.length, end.length);
+        return result;
+    }
+
+    public static byte[] subBytes(byte[] before, Integer start, Integer length) {
+        byte[] result = new byte[length];
+        System.arraycopy(before, start, result, 0, length);
+        return result;
+    }
+
+    /**
+     * 比较字节数组是否相同
+     *
+     * @param a
+     * @param b
+     * @return
+     */
+    public static boolean compareBytes(byte[] a, byte[] b) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length != b.length) {
+            return false;
+        }
+        if (a.length == b.length) {
+            for (int i = 0; i < a.length; i++) {
+                if (a[i] != b[i]) {
+                    return false;
+                }
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 只比对指定长度byte
+     *
+     * @param a
+     * @param b
+     * @param len
+     * @return
+     */
+    public static boolean compareBytes(byte[] a, byte[] b, int len) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length < len || b.length < len) {
+            return false;
+        }
+        for (int i = 0; i < len; i++) {
+            if (a[i] != b[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 将字节数组转换为二进制字符串
+     *
+     * @param items
+     * @return
+     */
+    public static String bytesToBinaryString(byte[] items) {
+        if (items == null || items.length == 0) {
+            return null;
+        }
+        StringBuffer buf = new StringBuffer();
+        for (byte item : items) {
+            buf.append(byteToBinaryString(item));
+        }
+        return buf.toString();
+    }
+
+    /**
+     * 将字节转换为二进制字符串
+     *
+     * @param item
+     * @return
+     */
+    public static String byteToBinaryString(byte item) {
+        byte a = item;
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < 8; i++) {
+            buf.insert(0, a % 2);
+            a = (byte) (a >> 1);
+        }
+        return buf.toString();
+    }
+
+    /**
+     * 对数组a，b进行异或运算
+     *
+     * @param a
+     * @param b
+     * @return
+     */
+    public static byte[] xor(byte[] a, byte[] b) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length != b.length) {
+            return null;
+        }
+        byte[] result = new byte[a.length];
+        for (int i = 0; i < a.length; i++) {
+            result[i] = (byte) (a[i] ^ b[i]);
+        }
+        return result;
+    }
+
+    /**
+     * 对数组a，b进行异或运算 运算长度len
+     *
+     * @param a
+     * @param b
+     * @param len
+     * @return
+     */
+    public static byte[] xor(byte[] a, byte[] b, int len) {
+        if (a == null || a.length == 0 || b == null || b.length == 0) {
+            return null;
+        }
+        if (a.length < len || b.length < len) {
+            return null;
+        }
+        byte[] result = new byte[len];
+        for (int i = 0; i < len; i++) {
+            result[i] = (byte) (a[i] ^ b[i]);
+        }
+        return result;
+    }
+
+    /**
+     * 将short整型数值转换为字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] shortToBytes(int num) {
+        byte[] temp = new byte[2];
+        for (int i = 0; i < 2; i++) {
+            temp[i] = (byte) ((num >>> (8 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转为整型
+     *
+     * @param arr
+     * @return
+     */
+    public static int bytesToShort(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        for (int i = 0; i < 2; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将整型数值转换为指定长度的字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] intToBytes(int num) {
+        byte[] temp = new byte[4];
+        for (int i = 0; i < 4; i++) {
+            temp[i] = (byte) ((num >>> (24 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将整型数值转换为指定长度的字节数组
+     *
+     * @param src
+     * @param len
+     * @return
+     */
+    public static byte[] intToBytes(int src, int len) {
+        if (len < 1 || len > 4) {
+            return null;
+        }
+        byte[] temp = new byte[len];
+        for (int i = 0; i < len; i++) {
+            temp[len - 1 - i] = (byte) ((src >>> (8 * i)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转换为整型数值
+     *
+     * @param arr
+     * @return
+     */
+    public static int bytesToInt(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        for (int i = 0; i < 4; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将long整型数值转换为字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] longToBytes(long num) {
+        byte[] temp = new byte[8];
+        for (int i = 0; i < 8; i++) {
+            temp[i] = (byte) ((num >>> (56 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转换为long整型数值
+     *
+     * @param arr
+     * @return
+     */
+    public static long bytesToLong(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        long result = 0;
+        int len = Math.min(8, arr.length);
+        for (int i = 0; i < len; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将16进制字符转换为字节
+     *
+     * @param c
+     * @return
+     */
+    public static byte toByte(char c) {
+        byte b = (byte) "0123456789ABCDEF".indexOf(c);
+        return b;
+    }
+
+    /**
+     * 功能描述：把两个字节的字节数组转化为整型数据，高位补零，例如：<br/>
+     * 有字节数组byte[] data = new byte[]{1,2};转换后int数据的字节分布如下：<br/>
+     * 00000000 00000000 00000001 00000010,函数返回258
+     *
+     * @param lenData 需要进行转换的字节数组
+     * @return 字节数组所表示整型值的大小
+     */
+    public static int bytesToIntWhereByteLengthEquals2(byte lenData[]) {
+        if (lenData.length != 2) {
+            return -1;
+        }
+        byte fill[] = new byte[]{0, 0};
+        byte real[] = new byte[4];
+        System.arraycopy(fill, 0, real, 0, 2);
+        System.arraycopy(lenData, 0, real, 2, 2);
+        int len = byteToInt(real);
+        return len;
+
+    }
+
+    /**
+     * 功能描述：将byte数组转化为int类型的数据
+     *
+     * @param byteVal 需要转化的字节数组
+     * @return 字节数组所表示的整型数据
+     */
+    public static int byteToInt(byte[] byteVal) {
+        int result = 0;
+        for (int i = 0; i < byteVal.length; i++) {
+            int tmpVal = (byteVal[i] << (8 * (3 - i)));
+            switch (i) {
+                case 0:
+                    tmpVal = tmpVal & 0xFF000000;
+                    break;
+                case 1:
+                    tmpVal = tmpVal & 0x00FF0000;
+                    break;
+                case 2:
+                    tmpVal = tmpVal & 0x0000FF00;
+                    break;
+                case 3:
+                    tmpVal = tmpVal & 0x000000FF;
+                    break;
+            }
+
+            result = result | tmpVal;
+        }
+        return result;
+    }
+
+    public static byte CheckXORSum(byte[] bData) {
+        byte sum = 0x00;
+        for (int i = 0; i < bData.length; i++) {
+            sum ^= bData[i];
+        }
+        return sum;
+    }
+
+    /**
+     * 从offset开始 将后续长度为len的byte字节转为int
+     *
+     * @param data
+     * @param offset
+     * @param len
+     * @return
+     */
+    public static int bytesToInt(byte[] data, int offset, int len) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        len = Math.min(len, 4);
+        for (int i = 0; i < len; i++) {
+            result <<= 8;
+            temp = data[offset + i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * byte字节数组中的字符串的长度
+     *
+     * @param data
+     * @return
+     */
+    public static int getBytesStringLen(byte[] data) {
+        int count = 0;
+        for (byte b : data) {
+            if (b == 0x00)
+                break;
+            count++;
+        }
+        return count;
+    }
+
+    /**
+     * 校验和
+     *
+     * @param msg    需要计算校验和的byte数组
+     * @param length 校验和位数
+     * @return 计算出的校验和数组
+     */
+    public static byte[] SumCheck(byte[] msg, int length) {
+        long mSum = 0;
+        byte[] mByte = new byte[length];
+
+        /** 逐Byte添加位数和 */
+        for (byte byteMsg : msg) {
+            long mNum = ((long) byteMsg >= 0)
+                    ? (long) byteMsg
+                    : ((long) byteMsg + 256);
+            mSum += mNum;
+        } /** end of for (byte byteMsg : msg) */
+
+        /** 位数和转化为Byte数组 */
+        for (int liv_Count = 0; liv_Count < length; liv_Count++) {
+            mByte[length - liv_Count
+                    - 1] = (byte) (mSum >> (liv_Count * 8) & 0xff);
+        } /** end of for (int liv_Count = 0; liv_Count < length; liv_Count++) */
+
+        return mByte;
+    }
+
+    /**
+     * 字节数据转十进制字符(补码-无符号)
+     *
+     * @param data
+     * @return
+     */
+    public static String getByteToStr(byte[] data) {
+        StringBuffer str = new StringBuffer();
+        for (int i = 0; i < data.length; i++) {
+            if (data[i] < 0) {
+                int tem = data[i] + 256;
+                str.append(tem + " ");
+            } else {
+                str.append(data[i] + " ");
+            }
+        }
+        return str.toString();
+    }
+
+
+    public static byte[] fileBytes(String pathname) throws IOException {
+        File filename = new File(pathname);
+        BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
+        ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+        byte[] temp = new byte[1024];
+        int size = 0;
+        while ((size = in.read(temp)) != -1) {
+            out.write(temp, 0, size);
+        }
+        in.close();
+        out.close();
+        byte[] content = out.toByteArray();
+        return content;
+    }
+
+    /**
+     * 单字节高低位互换
+     *
+     * @param src
+     * @return
+     */
+    public static int revert(int src) {
+        int lowByte = (src & 0xFF00) >> 8;
+        int highByte = (src & 0x00FF) << 8;
+        return lowByte | highByte;
+    }
+
+    /**
+     * 将字符串编码成16进制数字,适用于所有字符(包括中文)
+     *
+     * @param str 字符串
+     * @return
+     */
+    public static String stringEncodeToHex(String str) {
+        //根据默认编码获取字节数组
+        byte[] bytes = str.getBytes();
+        StringBuilder sb = new StringBuilder(bytes.length * 2);
+        //将字节数组中每个字节拆解成2位16进制整数
+        for (int i = 0; i < bytes.length; i++) {
+            sb.append(hexString.charAt((bytes[i] & 0xf0) >> 4));
+            sb.append(hexString.charAt((bytes[i] & 0x0f) >> 0));
+        }
+        return sb.toString();
+
+    }
+
+    /**
+     * 将16进制数字解码成字符串,适用于所有字符(包括中文)
+     *
+     * @param hex 16进制
+     * @return
+     */
+    public static String hexDecodeToString(String hex) {
+        try {
+            byte[] baKeyword = new byte[hex.length() / 2];
+            for (int i = 0; i < baKeyword.length; i++) {
+                baKeyword[i] = (byte) (0xff & Integer.parseInt(hex.substring(i * 2, i * 2 + 2), 16));
+            }
+            return new String(baKeyword, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
+    }
+
+    public static byte[] hexToByteArray(String inHex) {
+        inHex.replace(" ", "");
+        int hexlen = inHex.length();
+        byte[] result;
+        if (hexlen % 2 == 1) {
+            //奇数
+            hexlen++;
+            result = new byte[(hexlen / 2)];
+            inHex = "0" + inHex;
+        } else {
+            //偶数
+            result = new byte[(hexlen / 2)];
+        }
+        int j = 0;
+        for (int i = 0; i < hexlen; i += 2) {
+            result[j] = hexToByte(inHex.substring(i, i + 2));
+            j++;
+        }
+        return result;
+    }
+
+    public static byte hexToByte(String inHex) {
+        return (byte) Integer.parseInt(inHex, 16);
+    }
+
+    /**
+     * 数字转16进制字符串
+     * @param input
+     * @return
+     */
+    public static String integerToHex(Integer input){
+        byte[] bytes = ByteUtils.getBytes(input);
+        return ByteUtils.bytesToHex(bytes);
+    }
+}

+package org.thingsboard.server.common.data.yunteng.utils;
+
+public class CrcUtils {
+/**
+ * crc16 for modbus
+ * @param buf buffer to be crc
+ * @return crc result word
+ */
+	static int alex_crc16(byte[] buf) {
+		int i, j;
+		int c, crc = 0xFFFF;
+		for (i = 0; i < buf.length; i++) {
+			c = buf[i] & 0x00FF;//原始数据高8位和初始值进行异或运算保持不变
+			crc ^= c;
+			for (j = 0; j < 8; j++) {//原始数据左移8位
+				if ((crc & 0x0001) != 0) {
+					crc >>= 1;
+					crc ^= 0xA001;//把处理之后的数据和多项式进行模2除法，求得余数
+				} else
+					crc >>= 1;
+			}
+		}
+		return (crc);
+	}
+/**
+ * convert string to buffer and append the crc check word to the end of buffer
+ * @param toSend string to be convert
+ * @return buffer with crc word, high byte if after low byte according the modbus
+ */
+	public static String getSendBuf(String toSend) {
+		byte[] bb = ByteUtils.hexToBytes(toSend);
+		int ri = alex_crc16(bb);
+		byte[] crc = new byte[2];
+		crc[0] = (byte) (0xff & ri);
+		crc[1] = (byte) ((0xff00 & ri) >> 8);
+		return ByteUtils.bytesToStr(crc);
+	}
+
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		String str = "FF0300000004";
+		System.out.println(CrcUtils.getSendBuf(str));
+	}
+}

 /**
  * Copyright © 2016-2022 The Thingsboard Authors
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     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.
@@ -40,6 +40,8 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
+import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
@@ -63,7 +65,6 @@ import org.thingsboard.server.transport.tcp.session.TcpGatewaySessionHandler;
 import org.thingsboard.server.transport.tcp.util.ByteUtils;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Map;
@@ -156,7 +157,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             if (msg instanceof ByteBuf) {
                 ByteBuf message = (ByteBuf) msg;
                 byte[] byteMsg = ByteUtils.buf2Bytes(message);
-                String msgStr = ByteUtils.getString(byteMsg, ByteUtils.UTF_8);
+                String msgStr = ByteUtils.bytesToStr(byteMsg);
                 log.error("会话【{}】收到设备【{}】来自【{}】数据【{}】", sessionId, deviceSessionCtx.getDeviceId(), address, msgStr);
                 deviceSessionCtx.setChannel(ctx);
                 if (deviceSessionCtx.getDeviceInfo() == null || deviceSessionCtx.getDeviceProfile() == null) {
@@ -589,15 +590,10 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
      * @return
      */
     private ChannelFuture pushDeviceMsg(ChannelHandlerContext ctx, String message) {
-        try {
-            byte[] payloadInBytes = message.getBytes(ByteUtils.UTF_8);
-            ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
+        byte[] payloadInBytes = ByteUtils.strToBytes(message);
+        ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
 
-            return ctx.writeAndFlush(payload);
-        } catch (UnsupportedEncodingException e) {
-            log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        }
+        return ctx.writeAndFlush(payload);
     }
 
 
@@ -617,5 +613,4 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         ChannelHandlerContext ctx = deviceSessionCtx.getChannel();
         ctx.close();
     }
-
 }

@@ -126,8 +126,15 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 
     @Override
     public Optional<TcpDownEntry> convertToPublish(TcpDeviceWareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ExecutionException, InterruptedException {
-        ListenableFuture<Object> result = ctx.getContext().getJsEngine().invokeFunction(ctx.getRpcScriptId(),  rpcRequest.getParams());
-        return Optional.of(Futures.transform(result, t -> JacksonUtil.fromString(t.toString(), TcpDownEntry.class), MoreExecutors.directExecutor()).get());
+//        ListenableFuture<Object> result = ctx.getContext().getJsEngine().invokeFunction(ctx.getRpcScriptId(),  rpcRequest.getParams());
+//        return Optional.of(Futures.transform(result, t -> JacksonUtil.fromString(t.toString(), TcpDownEntry.class), MoreExecutors.directExecutor()).get());
+        String payload = rpcRequest.getParams();//methodThingskit
+        if (!payload.startsWith("{") && !payload.endsWith("}")) {
+            payload = payload.replace("\"","");;
+        }
+        TcpDownEntry data = new TcpDownEntry();
+        data.setDatas(payload);
+        return Optional.of(data);
     }
 
     @Override

@@ -2,6 +2,7 @@ package org.thingsboard.server.transport.tcp.adaptors;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 
 import java.io.Serializable;
 import java.util.UUID;
@@ -10,7 +11,6 @@ import java.util.UUID;
  * 下行脚本
  */
 @Data
-@AllArgsConstructor
 public class TcpDownEntry implements Serializable {
 
     /**
@@ -25,4 +25,7 @@ public class TcpDownEntry implements Serializable {
      * 下发给设备的最终内容
      */
     private String datas;
+
+    /**下发给设备的字符串编码*/
+    private TcpDataTypeEnum dataType;
 }

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.*;
 import java.nio.charset.Charset;
+import java.util.regex.Pattern;
 
 /**
  * @Description :数据类型转换工具类
@@ -43,6 +44,8 @@ public class ByteUtils {
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
     public static final String UTF_8 = "UTF-8";
+
+    private static String hexString="0123456789ABCDEF";
     /**
      * 将short整型数值转换为字节数组
      *
@@ -269,6 +272,22 @@ public class ByteUtils {
         return sb.toString();
     }
 
+    private static final String messageRegular = "^[A-Za-z0-9!@#$%^&*()]+$";
+    public static String bytesToStr(byte[] bs){
+        String result = getString(bs, ByteUtils.UTF_8);
+        if(!Pattern.compile(messageRegular).matcher(result).matches()){
+            result = bytesToHex(bs);
+        }
+        return result;
+    }
+
+    public static byte[] strToBytes(String str){
+        if(Pattern.compile("^[A-Fa-f0-9]+$").matcher(str).matches()){
+            return hexStr2Bytes(str);
+        }
+        return getBytes(str,ByteUtils.UTF_8);
+    }
+
     /**
      * 字节数组取前len个字节转16进制字符串
      *
@@ -785,4 +804,64 @@ public class ByteUtils {
         int highByte = (src & 0x00FF) << 8;
         return lowByte | highByte;
     }
+
+  /**
+   * 将字符串编码成16进制数字,适用于所有字符(包括中文)
+   * @param str 字符串
+   * @return
+   */
+  public static String stringEncodeToHex(String str) {
+        //根据默认编码获取字节数组
+        byte[] bytes=str.getBytes();
+        StringBuilder sb=new StringBuilder(bytes.length*2);
+        //将字节数组中每个字节拆解成2位16进制整数
+        for(int i=0;i<bytes.length;i++)
+        {
+            sb.append(hexString.charAt((bytes[i]&0xf0)>>4));
+            sb.append(hexString.charAt((bytes[i]&0x0f)>>0));
+        }
+        return sb.toString();
+
+    }
+
+  /**
+   * 将16进制数字解码成字符串,适用于所有字符(包括中文)
+   * @param hex 16进制
+   * @return
+   */
+  public static String hexDecodeToString(String hex) {
+        try{
+            byte[] baKeyword = new byte[hex.length()/2];
+            for(int i = 0; i < baKeyword.length; i++) {
+                baKeyword[i] = (byte)(0xff & Integer.parseInt(hex.substring(i*2, i*2+2),16));
+            }
+            return new String(baKeyword,"UTF-8");
+        }catch (UnsupportedEncodingException e){
+            return null;
+        }
+    }
+
+    public static byte[] hexToByteArray(String inHex){
+        inHex.replace(" ","");
+        int hexlen = inHex.length();
+        byte[] result;
+        if (hexlen % 2 == 1){
+            //奇数
+            hexlen++;
+            result = new byte[(hexlen/2)];
+            inHex="0"+inHex;
+        }else {
+            //偶数
+            result = new byte[(hexlen/2)];
+        }
+        int j=0;
+        for (int i = 0; i < hexlen; i+=2){
+            result[j]=hexToByte(inHex.substring(i,i+2));
+            j++;
+        }
+        return result;
+    }
+    public static byte hexToByte(String inHex){
+        return (byte)Integer.parseInt(inHex,16);
+    }
 }

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.TK_CONFIGURATION_CENTER_NAME)
@@ -16,6 +18,13 @@ public class TkConfigurationCenterEntity extends TenantBaseEntity {
   private String remark;
   private String organizationId;
   private String platform;
+
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String thumbnail;
+
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private ViewType viewType;
+
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
+  private String accessCredentials;
 }

 package org.thingsboard.server.dao.yunteng.entities;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -30,4 +31,7 @@ public class TkDataBoardEntity extends TenantBaseEntity {
   private Integer componentNum;
 
   private String organizationId;
+
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
+  private String accessCredentials;
 }

@@ -25,5 +25,6 @@ public class TkDataViewEntity extends TenantBaseEntity {
   @TableField(typeHandler = EnumTypeHandler.class)
   private ViewType viewType;
 
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String accessCredentials;
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.Table.TK_TASK_CENTER_NAME, autoResultMap = true)
+public class TkTaskCenterEntity extends TenantBaseEntity {
+  private String name;
+
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private TargetTypeEnum targetType;
+
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode executeTarget;
+
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode executeContent;
+
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode executeTime;
+
+  private Integer state;
+
+  private String remark;
+}

@@ -8,6 +8,7 @@ import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
+import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.dao.yunteng.entities.SysAreaEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysAreaMapper;
@@ -30,37 +31,47 @@ public class SysAreaServiceImpl implements SysAreaService {
   @Override
   public List<SysAreaDTO> list(SysAreaDTO sysAreaDTO) {
     String areaKey = sysAreaDTO.getParentId() + "-" + sysAreaDTO.getLevel();
-    List<SysAreaDTO> result = cacheManager.getCache(FastIotConstants.CacheConfigKey.AREA).get(areaKey,List.class);
-    if(result == null || result.isEmpty()){
-      result = ReflectUtils.sourceToTarget(
+    List<SysAreaDTO> result =
+        cacheManager.getCache(FastIotConstants.CacheConfigKey.AREA).get(areaKey, List.class);
+    if (result == null || result.isEmpty()) {
+      result =
+          ReflectUtils.sourceToTarget(
               sysAreaMapper.selectList(
-                      new LambdaQueryWrapper<SysAreaEntity>()
-                              .eq(sysAreaDTO.getLevel() != null, SysAreaEntity::getLevel, sysAreaDTO.getLevel())
-                              .eq(
-                                      sysAreaDTO.getParentId() != null,
-                                      SysAreaEntity::getParentId,
-                                      sysAreaDTO.getParentId())
-                              .eq(sysAreaDTO.getCode() != null, SysAreaEntity::getCode, sysAreaDTO.getCode())
-                              .like(
-                                      StringUtils.isNotEmpty(sysAreaDTO.getName()),
-                                      SysAreaEntity::getName,
-                                      sysAreaDTO.getName())),
+                  new LambdaQueryWrapper<SysAreaEntity>()
+                      .eq(
+                          sysAreaDTO.getLevel() != null,
+                          SysAreaEntity::getLevel,
+                          sysAreaDTO.getLevel())
+                      .eq(
+                          sysAreaDTO.getParentId() != null,
+                          SysAreaEntity::getParentId,
+                          sysAreaDTO.getParentId())
+                      .eq(
+                          sysAreaDTO.getCode() != null,
+                          SysAreaEntity::getCode,
+                          sysAreaDTO.getCode())
+                      .like(
+                          StringUtils.isNotEmpty(sysAreaDTO.getName()),
+                          SysAreaEntity::getName,
+                          sysAreaDTO.getName())),
               SysAreaDTO.class);
-      cacheManager.getCache(FastIotConstants.CacheConfigKey.AREA).put(areaKey,result);
+      cacheManager.getCache(FastIotConstants.CacheConfigKey.AREA).put(areaKey, result);
     }
 
-
     return result;
   }
 
   @Override
-  public SysAreaDTO getSysAreaInfoByCode(Long code) {
+  public SysAreaDTO getSysAreaInfoByCode(Long code, AreaLevelEnum levelEnum) {
     if (null == code) {
       return null;
     }
     SysAreaDTO target = new SysAreaDTO();
     SysAreaEntity source =
-        sysAreaMapper.selectOne(new LambdaQueryWrapper<SysAreaEntity>().eq(SysAreaEntity::getCode, code));
+        sysAreaMapper.selectOne(
+            new LambdaQueryWrapper<SysAreaEntity>()
+                .eq(SysAreaEntity::getCode, code)
+                .eq(SysAreaEntity::getLevel, levelEnum));
     if (null != source) {
       BeanUtils.copyProperties(source, target);
     }

@@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AreaInfoDTO;
+import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
 import org.thingsboard.server.dao.yunteng.entities.SysEnterpriseEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysEnterpriseMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -34,7 +35,8 @@ public class SysEnterpriseServiceImpl
   public boolean save(SysEnterpriseDTO sysAppDesignDTO, String tenantId) {
     SysEnterpriseEntity checkSysEnterprise =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<SysEnterpriseEntity>().eq(SysEnterpriseEntity::getTenantId, tenantId));
+            new LambdaQueryWrapper<SysEnterpriseEntity>()
+                .eq(SysEnterpriseEntity::getTenantId, tenantId));
     if (null != checkSysEnterprise) {
       throw new TkDataValidationException(ErrorMessage.DATA_ALREADY_EXISTS.getMessage());
     }
@@ -51,19 +53,24 @@ public class SysEnterpriseServiceImpl
     }
     if (null != sysEnterpriseDTO.getCodeTown()) {
       AreaInfoDTO sourceArea = new AreaInfoDTO();
-      SysAreaDTO town = sysAreaService.getSysAreaInfoByCode(sysEnterpriseDTO.getCodeTown());
+      SysAreaDTO town =
+          sysAreaService.getSysAreaInfoByCode(sysEnterpriseDTO.getCodeTown(), AreaLevelEnum.TOWN);
       sourceArea.setNameTown(town.getName());
       sourceArea.setCodeTown(town.getCode());
-      SysAreaDTO county = sysAreaService.getSysAreaInfoByCode(town.getParentId());
+      SysAreaDTO county =
+          sysAreaService.getSysAreaInfoByCode(town.getParentId(), AreaLevelEnum.COUNTY);
       sourceArea.setNameCoun(county.getName());
       sourceArea.setCodeCoun(county.getCode());
-      SysAreaDTO city = sysAreaService.getSysAreaInfoByCode(county.getParentId());
+      SysAreaDTO city =
+          sysAreaService.getSysAreaInfoByCode(county.getParentId(), AreaLevelEnum.CITY);
       sourceArea.setNameCity(city.getName());
       sourceArea.setCodeCity(city.getCode());
-      SysAreaDTO province = sysAreaService.getSysAreaInfoByCode(city.getParentId());
+      SysAreaDTO province =
+          sysAreaService.getSysAreaInfoByCode(city.getParentId(), AreaLevelEnum.PROVINCE);
       sourceArea.setNameProv(province.getName());
       sourceArea.setCodeProv(province.getCode());
-      SysAreaDTO country = sysAreaService.getSysAreaInfoByCode(province.getParentId());
+      SysAreaDTO country =
+          sysAreaService.getSysAreaInfoByCode(province.getParentId(), AreaLevelEnum.COUNTRY);
       sourceArea.setNameCountry(country.getName());
       sourceArea.setCodeCountry(country.getCode());
 
@@ -98,7 +105,8 @@ public class SysEnterpriseServiceImpl
     if (sysAppDesignDTO.getId() != null) {
       return baseMapper.update(
               sysAppDesignDTO.getEntity(SysEnterpriseEntity.class),
-              new LambdaQueryWrapper<SysEnterpriseEntity>().eq(SysEnterpriseEntity::getTenantId, tenantId))
+              new LambdaQueryWrapper<SysEnterpriseEntity>()
+                  .eq(SysEnterpriseEntity::getTenantId, tenantId))
           > 0;
     } else {
       return save(sysAppDesignDTO, tenantId);

@@ -2,6 +2,8 @@ package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
@@ -15,12 +17,14 @@ import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
+import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysJobMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /** 定时任务调度信息 服务层 */
 @Service
@@ -35,10 +39,12 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
     scheduler.clear();
     List<SysJobEntity> jobList = new ArrayList<>();
     try {
-      jobList.addAll(baseMapper.selectList(
-              new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getStatus, StatusEnum.ENABLE.getIndex())));
-    }catch (Exception e){
-      //TODO: 兼容ThingsboardInstallApplication。执行数据库脚本前，会跑表不存在异常。
+      jobList.addAll(
+          baseMapper.selectList(
+              new LambdaQueryWrapper<SysJobEntity>()
+                  .eq(SysJobEntity::getStatus, StatusEnum.ENABLE.getIndex())));
+    } catch (Exception e) {
+      // TODO: 兼容ThingsboardInstallApplication。执行数据库脚本前，会跑表不存在异常。
     }
 
     for (SysJobEntity job : jobList) {
@@ -72,15 +78,22 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
   public SysJobDTO selectJobById(String id) {
 
     return Optional.ofNullable(
-            baseMapper.selectOne(new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getId, id)))
+            baseMapper.selectOne(
+                new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getId, id)))
         .map(obj -> obj.getDTO(SysJobDTO.class))
         .orElseThrow(
-            () -> {
-              throw new TkDataValidationException(
-                  ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
-            });
+            () ->
+                new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage()));
   }
 
+  @Override
+  public ListenableFuture<SysJobDTO> selectJobInfoById(String id) {
+    return Optional.ofNullable(
+            baseMapper.selectOne(
+                new LambdaQueryWrapper<SysJobEntity>().eq(SysJobEntity::getId, id)))
+        .map(obj -> Futures.immediateFuture(obj.getDTO(SysJobDTO.class)))
+        .orElse(Futures.immediateFuture(null));
+  }
   /**
    * 暂停任务
    *
@@ -130,6 +143,40 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
     }
     return rows > 0;
   }
+  /**
+   * 批量删除任务后，所对应的trigger也将被删除
+   *
+   * @param sourceIds 源ID
+   * @param jobGroup 分组
+   * @param tenantId 租户ID
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public boolean deleteJobs(List<String> sourceIds, String jobGroup, String tenantId)
+      throws SchedulerException {
+    List<String> jobIds =
+        Optional.ofNullable(
+                baseMapper.selectList(
+                    new LambdaQueryWrapper<SysJobEntity>()
+                        .eq(SysJobEntity::getTenantId, tenantId)
+                        .eq(SysJobEntity::getJobGroup, jobGroup)
+                        .in(SysJobEntity::getSourceId, sourceIds)))
+            .map(list -> list.stream().map(BaseEntity::getId).collect(Collectors.toList()))
+            .orElse(null);
+    if (null != jobIds && !jobIds.isEmpty()) {
+      int rows = baseMapper.deleteBatchIds(jobIds);
+      if (rows > 0) {
+        List<JobKey> jobKeys = new ArrayList<>();
+        for (String jobId : jobIds) {
+          jobKeys.add(ScheduleUtils.getJobKey(jobId, jobGroup));
+        }
+        if (!jobKeys.isEmpty()) {
+          return scheduler.deleteJobs(jobKeys);
+        }
+      }
+    }
+    return false;
+  }
 
   /**
    * 批量删除调度信息

@@ -12,6 +12,7 @@ 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.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationCenterEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
@@ -128,4 +129,52 @@ public class TkConfigurationCenterServiceImpl
         ? list.get(FastIotConstants.MagicNumber.ZERO)
         : null;
   }
+
+  @Override
+  public ConfigurationCenterDTO getConfigurationCenterInfoById(String id, String tenantId) {
+    TkConfigurationCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkConfigurationCenterEntity>()
+                .eq(TkConfigurationCenterEntity::getTenantId, tenantId)
+                .eq(TkConfigurationCenterEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return entity.getDTO(ConfigurationCenterDTO.class);
+  }
+
+  @Override
+  public boolean isNeedCredentialsForPublicView(String id, String tenantId) {
+    TkConfigurationCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkConfigurationCenterEntity>()
+                .eq(TkConfigurationCenterEntity::getTenantId, tenantId)
+                .eq(TkConfigurationCenterEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return StringUtils.isNotEmpty(entity.getAccessCredentials());
+  }
+
+  @Override
+  @Transactional
+  public boolean shareOrMonopolyConfigurationCenter(
+      boolean isShare, String id, String accessCredentials, String tenantId) {
+    TkConfigurationCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkConfigurationCenterEntity>()
+                .eq(TkConfigurationCenterEntity::getTenantId, tenantId)
+                .eq(TkConfigurationCenterEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (isShare) {
+      entity.setViewType(ViewType.PUBLIC_VIEW);
+      entity.setAccessCredentials(accessCredentials);
+    } else {
+      entity.setViewType(ViewType.PRIVATE_VIEW);
+      entity.setAccessCredentials(null);
+    }
+    return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
+  }
 }

@@ -12,6 +12,7 @@ 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.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
+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.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDataBoardEntity;
@@ -82,12 +83,11 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   @Transactional
   public DataBoardDTO saveOrUpdateDataBoard(DataBoardDTO dataBoardDTO) {
     TkDataBoardEntity dataBoard = dataBoardDTO.getEntity(TkDataBoardEntity.class);
+    if(dataBoardDTO.getViewType().equals(ViewType.PRIVATE_VIEW)){
+      dataBoard.setAccessCredentials(null);
+    }
     if (StringUtils.isEmpty(dataBoardDTO.getId())) {
-      try {
-        baseMapper.insert(dataBoard);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
+      baseMapper.insert(dataBoard);
     } else {
       if (null != dataBoardDTO.getLayout() && !dataBoardDTO.getLayout().isEmpty()) {
         dataBoard.setLayout(JacksonUtil.convertValue(dataBoardDTO.getLayout(), JsonNode.class));
@@ -111,9 +111,9 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   @Transactional
   public boolean deleteDataBoard(DeleteDTO deleteDTO) {
     dataComponentMapper.delete(
-            new LambdaQueryWrapper<TkDataComponentEntity>()
-                    .eq(TkDataComponentEntity::getTenantId, deleteDTO.getTenantId())
-                    .in(TkDataComponentEntity::getDataBoardId, deleteDTO.getIds()));
+        new LambdaQueryWrapper<TkDataComponentEntity>()
+            .eq(TkDataComponentEntity::getTenantId, deleteDTO.getTenantId())
+            .in(TkDataComponentEntity::getDataBoardId, deleteDTO.getIds()));
     return baseMapper.delete(
             new LambdaQueryWrapper<TkDataBoardEntity>()
                 .eq(TkDataBoardEntity::getTenantId, deleteDTO.getTenantId())
@@ -170,4 +170,38 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   public boolean updateDataBoardComponentNum(String id, String tenantId, int count) {
     return baseMapper.updateDataBoardComponentNum(id, tenantId, count);
   }
+
+  @Override
+  public boolean isNeedCredentialsForPublicView(String id, String tenantId) {
+    TkDataBoardEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDataBoardEntity>()
+                .eq(TkDataBoardEntity::getTenantId, tenantId)
+                .eq(TkDataBoardEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return StringUtils.isNotEmpty(entity.getAccessCredentials());
+  }
+
+  @Override
+  public boolean shareOrMonopolyDataBoard(
+      boolean isShare, String id, String accessCredentials, String tenantId) {
+    TkDataBoardEntity entity =
+            baseMapper.selectOne(
+                    new LambdaQueryWrapper<TkDataBoardEntity>()
+                            .eq(TkDataBoardEntity::getTenantId, tenantId)
+                            .eq(TkDataBoardEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (isShare) {
+      entity.setViewType(ViewType.PUBLIC_VIEW);
+      entity.setAccessCredentials(accessCredentials);
+    } else {
+      entity.setViewType(ViewType.PRIVATE_VIEW);
+      entity.setAccessCredentials(null);
+    }
+    return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
+  }
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -11,9 +12,9 @@ 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.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDataViewEntity;
-import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDataViewMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -31,116 +32,161 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class TkDataViewServiceImpl
-        extends AbstractBaseService<TkDataViewMapper, TkDataViewEntity>
-        implements TkDataViewService {
-    private final OrganizationMapper organizationMapper;
-    private final TkDataViewContentService ytDataViewContentService;
-    private final UserOrganizationMappingService userOrganizationMappingService;
+public class TkDataViewServiceImpl extends AbstractBaseService<TkDataViewMapper, TkDataViewEntity>
+    implements TkDataViewService {
+  private final OrganizationMapper organizationMapper;
+  private final TkDataViewContentService ytDataViewContentService;
+  private final UserOrganizationMappingService userOrganizationMappingService;
 
-    @Override
-    public TkPageData<TkDataViewDTO> page(
-            Map<String, Object> queryMap, boolean tenantAdmin) {
-        List<String> organizationIds = null;
-        if (null != queryMap.get("organizationId")) {
-            String organizationId = (String) queryMap.get("organizationId");
-            List<OrganizationDTO> organizationList =
-                    organizationMapper.findOrganizationTreeList(
-                            (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
-            if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
-                throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-            }
-            organizationIds =
-                    organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
-        }
-        if (!tenantAdmin && null != queryMap.get("userId")) {
-            // 获取客户的组织关系
-            String userId = (String) queryMap.get("userId");
-            organizationIds = userOrganizationMappingService.compareOrganizationIdsByCustomerId(organizationIds, userId);
-        }
-        if (null != organizationIds && organizationIds.size() > FastIotConstants.MagicNumber.ZERO) {
-            queryMap.put("organizationIds", organizationIds);
-        }
-        IPage<TkDataViewEntity> page =
-                getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
-        IPage<TkDataViewDTO> DataViewIPage =
-                baseMapper.getDataViewPage(page, queryMap);
-        return getPageData(DataViewIPage, TkDataViewDTO.class);
+  @Override
+  public TkPageData<TkDataViewDTO> page(Map<String, Object> queryMap, boolean tenantAdmin) {
+    List<String> organizationIds = null;
+    if (null != queryMap.get("organizationId")) {
+      String organizationId = (String) queryMap.get("organizationId");
+      List<OrganizationDTO> organizationList =
+          organizationMapper.findOrganizationTreeList(
+              (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
+      if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
+        throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      organizationIds =
+          organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
     }
+    if (!tenantAdmin && null != queryMap.get("userId")) {
+      // 获取客户的组织关系
+      String userId = (String) queryMap.get("userId");
+      organizationIds =
+          userOrganizationMappingService.compareOrganizationIdsByCustomerId(
+              organizationIds, userId);
+    }
+    if (null != organizationIds && organizationIds.size() > FastIotConstants.MagicNumber.ZERO) {
+      queryMap.put("organizationIds", organizationIds);
+    }
+    IPage<TkDataViewEntity> page =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<TkDataViewDTO> DataViewIPage = baseMapper.getDataViewPage(page, queryMap);
+    return getPageData(DataViewIPage, TkDataViewDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public TkDataViewDTO saveDataView(TkDataViewDTO tkDataViewDTO) {
+    TkDataViewEntity dataView = tkDataViewDTO.getEntity(TkDataViewEntity.class);
+    dataView.setState(0);
+    baseMapper.insert(dataView);
+    TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
+    contentDTO.setTenantId(dataView.getTenantId());
+    contentDTO.setViewId(dataView.getId());
+    ytDataViewContentService.saveDataViewContent(contentDTO);
+    return tkDataViewDTO;
+  }
 
-    @Override
-    @Transactional
-    public TkDataViewDTO saveDataView(TkDataViewDTO TkDataViewDTO) {
-        TkDataViewEntity dataView =
-                TkDataViewDTO.getEntity(TkDataViewEntity.class);
-        dataView.setState(0);
-        baseMapper.insert(dataView);
-        TkDataViewContentDTO contentDTO = new TkDataViewContentDTO();
-        contentDTO.setTenantId(dataView.getTenantId());
-        contentDTO.setViewId(dataView.getId());
-        contentDTO.setContent(
-                "<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
-        ytDataViewContentService.saveDataViewContent(contentDTO);
-        return TkDataViewDTO;
+  @Override
+  @Transactional
+  public TkDataViewDTO updateDataView(TkDataViewDTO tkDataViewDTO) {
+    TkDataViewEntity dataView = baseMapper.selectById(tkDataViewDTO.getId());
+    if (!dataView.getTenantId().equals(tkDataViewDTO.getTenantId())) {
+      throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
+    //设计不修改状态
+    tkDataViewDTO.setViewType(null);
+    baseMapper.updateById(tkDataViewDTO.getEntity(TkDataViewEntity.class));
+    return tkDataViewDTO;
+  }
 
-    @Override
-    @Transactional
-    public TkDataViewDTO updateDataView(TkDataViewDTO TkDataViewDTO) {
-        TkDataViewEntity DataView = baseMapper.selectById(TkDataViewDTO.getId());
-        if (!DataView.getTenantId().equals(TkDataViewDTO.getTenantId())) {
-            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
-        }
-        baseMapper.updateById(TkDataViewDTO.getEntity(TkDataViewEntity.class));
-        return TkDataViewDTO;
+  @Override
+  @Transactional
+  public boolean deleteDataView(DeleteDTO deleteDTO) {
+    List<TkDataViewEntity> centerList =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDataViewEntity>()
+                .in(TkDataViewEntity::getId, deleteDTO.getIds()));
+    for (TkDataViewEntity center : centerList) {
+      if (!center.getTenantId().equals(deleteDTO.getTenantId())) {
+        throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+      }
     }
+    ytDataViewContentService.deleteDataViewContentByCenterId(deleteDTO.getIds());
+    return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
+  }
 
-    @Override
-    @Transactional
-    public boolean deleteDataView(DeleteDTO deleteDTO) {
-        List<TkDataViewEntity> centerList =
-                baseMapper.selectList(
-                        new LambdaQueryWrapper<TkDataViewEntity>()
-                                .in(TkDataViewEntity::getId, deleteDTO.getIds()));
-        for (TkDataViewEntity center : centerList) {
-            if (!center.getTenantId().equals(deleteDTO.getTenantId())) {
-                throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
-            }
-        }
-        ytDataViewContentService.deleteDataViewContentByCenterId(deleteDTO.getIds());
-        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
+  @Override
+  public TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId) {
+    List<TkDataViewContentInfoDTO> list = baseMapper.getDataViewInfoById(id, tenantId);
+    return list.size() > FastIotConstants.MagicNumber.ZERO
+        ? list.get(FastIotConstants.MagicNumber.ZERO)
+        : null;
+  }
+
+  @Override
+  public TkDataViewDTO getDataViewById(String id, String tenantId) {
+    TkDataViewEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDataViewEntity>()
+                .eq(TkDataViewEntity::getTenantId, tenantId)
+                .eq(TkDataViewEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+    return entity.getDTO(TkDataViewDTO.class);
+  }
 
-    @Override
-    public TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId) {
-        List<TkDataViewContentInfoDTO> list = baseMapper.getDataViewInfoById(id, tenantId);
-        return list.size() > FastIotConstants.MagicNumber.ZERO
-                ? list.get(FastIotConstants.MagicNumber.ZERO)
-                : null;
+  @Override
+  public boolean isNeedCredentialsForPublicView(String id, String tenantId) {
+    TkDataViewEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDataViewEntity>()
+                .eq(TkDataViewEntity::getTenantId, tenantId)
+                .eq(TkDataViewEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+    return StringUtils.isNotEmpty(entity.getAccessCredentials());
+  }
 
+  @Override
+  @Transactional
+  public boolean shareOrMonopolyDataViewCenter(
+      boolean isShare, String id, String accessCredentials, String tenantId) {
+    TkDataViewEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDataViewEntity>()
+                .eq(TkDataViewEntity::getTenantId, tenantId)
+                .eq(TkDataViewEntity::getId, id));
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (isShare) {
+      entity.setViewType(ViewType.PUBLIC_VIEW);
+      entity.setAccessCredentials(accessCredentials);
+    } else {
+      entity.setViewType(ViewType.PRIVATE_VIEW);
+      entity.setAccessCredentials(null);
+    }
+    return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
+  }
 
-    @Override
-    public boolean publishDataView(String id, String tenantId) {
-        TkDataViewEntity dataView = baseMapper.selectById(id);
-        if (!dataView.getTenantId().equals(tenantId)) {
-            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
-        }
-        //Modify dataView state is publish
-        dataView.setState(1);
-        int resultInt = baseMapper.updateById(dataView);
-        return resultInt > 0 ? true : false;
+  @Override
+  public boolean publishDataView(String id, String tenantId) {
+    TkDataViewEntity dataView = baseMapper.selectById(id);
+    if (!dataView.getTenantId().equals(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
+    // Modify dataView state is publish
+    dataView.setState(FastIotConstants.StateValue.PUBLISH);
+    int resultInt = baseMapper.updateById(dataView);
+    return resultInt > FastIotConstants.MagicNumber.ZERO;
+  }
 
-    @Override
-    public boolean cancelPublishDataView(String id, String tenantId) {
-        TkDataViewEntity dataView = baseMapper.selectById(id);
-        if (!dataView.getTenantId().equals(tenantId)) {
-            throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
-        }
-        //Modify dataView state is cancelPublish
-        dataView.setState(0);
-        int resultInt = baseMapper.updateById(dataView);
-        return resultInt > 0 ? true : false;
+  @Override
+  public boolean cancelPublishDataView(String id, String tenantId) {
+    TkDataViewEntity dataView = baseMapper.selectById(id);
+    if (!dataView.getTenantId().equals(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
+    // Modify dataView state is cancelPublish
+    dataView.setState(FastIotConstants.StateValue.CANCEL_PUBLISH);
+    int resultInt = baseMapper.updateById(dataView);
+    return resultInt > FastIotConstants.MagicNumber.ZERO;
+  }
 }

@@ -9,17 +9,17 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkCustomerDeviceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
+import org.thingsboard.server.common.data.yunteng.utils.CrcUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
@@ -246,11 +246,12 @@ public class TkDeviceScriptServiceImpl
   }
 
   @Override
-  public List<TkDeviceScriptDTO> findDeviceScript(String tenantId) {
+  public List<TkDeviceScriptDTO> findDeviceScript(String tenantId,TkScriptFunctionType scriptType) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
-            .eq(TkDeviceScriptEntity::getTenantId, tenantId);
+                .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType).and(s->s
+                        .eq(TkDeviceScriptEntity::getTenantId, tenantId).or(r->r.eq(TkDeviceScriptEntity::getTenantId, EntityId.NULL_UUID.toString())));
     return baseMapper.selectList(queryWrapper).stream()
         .map(item -> item.getDTO(TkDeviceScriptDTO.class))
         .collect(Collectors.toList());
@@ -295,4 +296,68 @@ public class TkDeviceScriptServiceImpl
     }
     return scriptIds;
   }
+
+  @Override
+  public String modbus(TkDeviceRpcDTO config) {
+    StringBuilder result = new StringBuilder(config.getDeviceCode());
+    String functionCode = config.getMethod();
+    result.append(functionCode);
+    String addrStr = ByteUtils.integerToHex(config.getRegisterAddr());
+    result.append(addrStr.substring(addrStr.length()-4));
+
+    List<Integer> values = config.getRegisterVales();
+    if(values ==null || values.isEmpty()){
+      //读寄存器数据
+      result.append(modelHex(config.getRegisterNum()));
+    }else if(values.size() == 1){
+      //单个写入
+      result.append(modelHex(values.get(0)));
+    }else{
+      //多个写入
+      result.append(modelHex(config.getRegisterNum()));
+      result.append(multData(functionCode,values));
+    }
+    result.append(CrcUtils.getSendBuf(result.toString()));
+
+
+    return result.toString();
+  }
+
+
+  private String modelHex(Integer max){
+    String addrStr = ByteUtils.integerToHex(max);
+    return addrStr.substring(addrStr.length()-4);
+  }
+
+  private String dataLength(Integer max){
+    String addrStr = ByteUtils.integerToHex(max);
+    return addrStr.substring(addrStr.length()-2);
+  }
+  private String multData(String functionCode,List<Integer>datas){
+    StringBuilder dataStr = new StringBuilder();
+    if("16".equals(functionCode)){
+      dataStr.append(dataLength(datas.size()*2));
+      for(Integer item: datas){
+        dataStr.append(modelHex(item));
+      }
+    }else{
+      Integer filter = datas.size()%8;
+      Integer num = datas.size()/8;
+      dataStr.append(dataLength(filter == 0 ?num:num+1));
+      byte one = 0x00;
+      int index =1;
+      for(Integer item: datas){
+        byte byteVal=item.byteValue();
+        one =(byte)(one<< 1);
+        one ^= byteVal;
+        if(index%8==0 || datas.size() == index){
+          dataStr.append(ByteUtils.byteToHex(one));
+          one=0x00;
+        }
+        index++;
+
+      }
+    }
+    return dataStr.toString();
+  }
 }

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -365,7 +367,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
-    //用于数据流转已选,待选过滤============开始
+    // 用于数据流转已选,待选过滤============开始
     if (StringUtils.isNotEmpty(convertConfigId)) {
       ConvertConfigDTO configDTO =
           convertConfigService.findConvertConfigDTOById(tenantId, convertConfigId);
@@ -382,7 +384,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         }
       }
     }
-    //用于数据流转已选,待选过滤============结束
+    // 用于数据流转已选,待选过滤============结束
     IPage<TkDeviceEntity> page =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<DeviceDTO> deviceIPage = baseMapper.getDevicePage(page, queryMap);
@@ -668,12 +670,16 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
 
-    List<TkDeviceEntity> organizationDevices = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>().eq(TkDeviceEntity::getDeviceProfileId, projectId).in(TkDeviceEntity::getOrganizationId,orgIds));
+    List<TkDeviceEntity> organizationDevices =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getDeviceProfileId, projectId)
+                .in(TkDeviceEntity::getOrganizationId, orgIds));
     List<String> allDevices = new ArrayList<>();
-    if(organizationDevices != null && !organizationDevices.isEmpty()){
+    if (organizationDevices != null && !organizationDevices.isEmpty()) {
       for (TkDeviceEntity item : organizationDevices) {
         DeviceTypeEnum deviceType = item.getDeviceType();
-        if(DeviceTypeEnum.SENSOR.equals(deviceType)){
+        if (DeviceTypeEnum.SENSOR.equals(deviceType)) {
           allDevices.add(item.getGatewayId());
           continue;
         }
@@ -682,4 +688,26 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return allDevices;
   }
+
+  @Override
+  public ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(
+      String deviceProfileId, String tenantId) {
+    if (StringUtils.isEmpty(deviceProfileId) || StringUtils.isEmpty(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<DeviceDTO> devices = new ArrayList<>();
+    List<TkDeviceEntity> entityList =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTenantId, tenantId)
+                .eq(TkDeviceEntity::getDeviceProfileId, deviceProfileId));
+    return Optional.ofNullable(entityList)
+        .map(
+            list ->
+                Futures.immediateFuture(
+                    list.stream()
+                        .map(obj -> obj.getDTO(DeviceDTO.class))
+                        .collect(Collectors.toList())))
+        .orElse(Futures.immediateFuture(devices));
+  }
 }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.google.common.base.Objects;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDataViewDTO;
+import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
+import org.thingsboard.server.common.data.yunteng.enums.ShareViewType;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
+import org.thingsboard.server.dao.yunteng.service.*;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class TkShareViewServiceImpl implements TkShareViewService {
+
+  private final TkDataComponentService tkDataComponentService;
+  private final TkDataBoardService tkDataBoardService;
+  private final TkDataViewService tkDataViewService;
+  private final TkConfigurationCenterService tkConfigurationCenterService;
+
+  private MoreDataComponentInfoDTO viewDataComponentsByBoardId(
+      String boardId, String accessCredentials, String tenantId) {
+    DataBoardDTO dto = tkDataBoardService.findDataBoardInfoById(boardId, tenantId);
+    checkParams(dto, dto.getViewType(), dto.getAccessCredentials(), accessCredentials);
+    MoreDataComponentInfoDTO moreDataComponentInfoDTO = new MoreDataComponentInfoDTO();
+    List<DataComponentDTO> data =
+        tkDataComponentService.getDataComponentsByBoardId(tenantId, boardId);
+    moreDataComponentInfoDTO.setComponentLayout(dto.getLayout());
+    moreDataComponentInfoDTO.setComponentData(data);
+    return moreDataComponentInfoDTO;
+  }
+
+  private ConfigurationContentInfoDTO viewConfigurationById(
+      String id, String accessCredentials, String tenantId) {
+    ConfigurationCenterDTO centerDTO =
+        tkConfigurationCenterService.getConfigurationCenterInfoById(id, tenantId);
+    checkParams(
+        centerDTO, centerDTO.getViewType(), centerDTO.getAccessCredentials(), accessCredentials);
+    return tkConfigurationCenterService.getConfigurationInfos(id, tenantId);
+  }
+
+  private TkDataViewContentInfoDTO viewDataViewInfosById(
+      String id, String accessCredentials, String tenantId) {
+    TkDataViewDTO dto = tkDataViewService.getDataViewById(id, tenantId);
+    checkParams(dto, dto.getViewType(), dto.getAccessCredentials(), accessCredentials);
+    return tkDataViewService.getDataViewInfos(id, tenantId);
+  }
+
+  private void checkParams(
+      Object dto, ViewType viewType, String targetCredentials, String sourceCredentials) {
+    if (null == dto) {
+      throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    if (!Objects.equal(viewType, ViewType.PUBLIC_VIEW)) {
+      throw new TkDataValidationException(ErrorMessage.CURRENT_VIEW_IS_PRIVATE.getMessage());
+    }
+    if (StringUtils.isNotEmpty(targetCredentials)) {
+      if (!Objects.equal(targetCredentials, sourceCredentials)) {
+        throw new TkDataValidationException(
+            ErrorMessage.CURRENT_URL_REQUIRES_PERMISSION.getMessage());
+      }
+    }
+  }
+
+  @Override
+  public Object viewShareDataById(
+      ShareViewType shareViewType, String id, String accessCredentials, String tenantId) {
+    Object result;
+    switch (shareViewType) {
+      case DATA_BOARD:
+        result = viewDataComponentsByBoardId(id, accessCredentials, tenantId);
+        break;
+      case SCADA:
+        result = viewConfigurationById(id, accessCredentials, tenantId);
+        break;
+      case LARGE_SCREEN:
+        result = viewDataViewInfosById(id, accessCredentials, tenantId);
+        break;
+      default:
+        throw new TkDataValidationException(ErrorMessage.SHARE_VIEW_TYPE_NOT_EXIST.getMessage());
+    }
+    return result;
+  }
+
+  @Override
+  public boolean checkPublicViewNeedCredentials(
+      ShareViewType type, String viewId, String tenantId) {
+    boolean result;
+    switch (type) {
+      case SCADA:
+        result = tkConfigurationCenterService.isNeedCredentialsForPublicView(viewId, tenantId);
+        break;
+      case DATA_BOARD:
+        result = tkDataBoardService.isNeedCredentialsForPublicView(viewId, tenantId);
+        break;
+      case LARGE_SCREEN:
+        result = tkDataViewService.isNeedCredentialsForPublicView(viewId, tenantId);
+        break;
+      default:
+        throw new TkDataValidationException(ErrorMessage.SHARE_VIEW_TYPE_NOT_EXIST.getMessage());
+    }
+    return result;
+  }
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.quartz.SchedulerException;
+import org.springframework.stereotype.Service;
+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.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SysJobDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TargetContentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TaskExecuteTimeDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TaskTypeDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
+import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkTaskCenterEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TaskCenterMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
+import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
+
+import javax.transaction.Transactional;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class TkTaskCenterServiceImpl
+    extends AbstractBaseService<TaskCenterMapper, TkTaskCenterEntity>
+    implements TkTaskCenterService {
+  private final TkSysJobService tkSysJobService;
+  private final TkDeviceService tkDeviceService;
+  private final CacheUtils cacheUtils;
+
+  @Override
+  public TkPageData<TkTaskCenterDTO> taskCenterPage(Map<String, Object> queryMap, String tenantId) {
+    Integer state = (Integer) queryMap.get("state");
+    TargetTypeEnum targetTypeEnum = (TargetTypeEnum) queryMap.get("targetType");
+    IPage<TkTaskCenterEntity> page =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<TkTaskCenterEntity> taskCenterIPage =
+        baseMapper.selectPage(
+            page,
+            new LambdaQueryWrapper<TkTaskCenterEntity>()
+                .eq(TkTaskCenterEntity::getTenantId, tenantId)
+                .eq(null != state, TkTaskCenterEntity::getState, state)
+                .eq(null != targetTypeEnum, TkTaskCenterEntity::getTargetType, targetTypeEnum));
+    if (!taskCenterIPage.getRecords().isEmpty()) {
+      List<TkTaskCenterDTO> listRecords =
+          taskCenterIPage.getRecords().stream()
+              .map(
+                  entity -> {
+                    TkTaskCenterDTO dto = entity.getDTO(TkTaskCenterDTO.class);
+                    dto.setExecuteContent(
+                        JacksonUtil.convertValue(entity.getExecuteContent(), TaskTypeDTO.class));
+                    dto.setExecuteTime(
+                        JacksonUtil.convertValue(
+                            entity.getExecuteTime(), TaskExecuteTimeDTO.class));
+                    dto.setExecuteTarget(
+                        JacksonUtil.convertValue(
+                            entity.getExecuteTarget(), TargetContentDTO.class));
+                    return dto;
+                  })
+              .collect(Collectors.toList());
+      return new TkPageData<>(listRecords, taskCenterIPage.getTotal());
+    }
+    return getPageData(taskCenterIPage, TkTaskCenterDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public TkTaskCenterDTO saveOrUpdateTaskCenter(TkTaskCenterDTO tkTaskCenterDTO) {
+    TkTaskCenterEntity entity = tkTaskCenterDTO.getEntity(TkTaskCenterEntity.class);
+    JsonNode jsonNode = tkTaskCenterDTO.getExecuteContent().getPushContent();
+    if (null == jsonNode || null == jsonNode.get(FastIotConstants.RPC_COMMAND)) {
+      throw new TkDataValidationException(ErrorMessage.EXECUTE_COMMAND_IS_NULL.getMessage());
+    }
+    TaskExecuteTimeDTO executeTime = tkTaskCenterDTO.getExecuteTime();
+    if (null == executeTime || StringUtils.isEmpty(executeTime.getCron())) {
+      throw new TkDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
+    }
+    entity.setExecuteContent(
+        JacksonUtil.convertValue(tkTaskCenterDTO.getExecuteContent(), JsonNode.class));
+    entity.setExecuteTarget(
+        JacksonUtil.convertValue(tkTaskCenterDTO.getExecuteTarget(), JsonNode.class));
+    entity.setExecuteTime(
+        JacksonUtil.convertValue(tkTaskCenterDTO.getExecuteTime(), JsonNode.class));
+    if (StringUtils.isEmpty(tkTaskCenterDTO.getId())) {
+      entity.setState(FastIotConstants.StateValue.DISABLE);
+      baseMapper.insert(entity);
+    } else {
+      TkTaskCenterDTO queryDTO =
+          findTaskCenterInfoById(tkTaskCenterDTO.getId(), tkTaskCenterDTO.getTenantId());
+      if (null == queryDTO) {
+        throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+      }
+      // 只有通过修改状态接口,才可以修改状态
+      entity.setState(null);
+      baseMapper.updateById(entity);
+      updateTaskCenterCache(entity);
+    }
+    return tkTaskCenterDTO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteTaskCenter(DeleteDTO deleteDTO) throws SchedulerException {
+    List<TkTaskCenterEntity> list =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkTaskCenterEntity>()
+                .eq(TkTaskCenterEntity::getTenantId, deleteDTO.getTenantId())
+                .in(TkTaskCenterEntity::getId, deleteDTO.getIds()));
+    if (null == list || list.isEmpty()) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<String> sourceIds = new ArrayList<>();
+    for (TkTaskCenterEntity entity : list) {
+      // 任务中心,是启用状态不能删除
+      if (entity.getState() == FastIotConstants.StateValue.ENABLE) {
+        throw new TkDataValidationException(
+            String.format(
+                ErrorMessage.DATA_STATE_ENABLE_NOT_DELETE.getMessage(), entity.getName()));
+      }
+      sourceIds.add(entity.getId());
+    }
+    int result = baseMapper.deleteBatchIds(sourceIds);
+    if (result > FastIotConstants.MagicNumber.ZERO) {
+      return tkSysJobService.deleteJobs(
+          sourceIds, JobGroupEnum.TASK_CENTER.name(), deleteDTO.getTenantId());
+    }
+    // 移除任务中心缓存
+    for (String taskCenterId : sourceIds) {
+      String key = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS + taskCenterId;
+      cacheUtils.invalidate(key);
+    }
+    return false;
+  }
+
+  @Override
+  public TkTaskCenterDTO findTaskCenterInfoById(String id, String tenantId) {
+    if (StringUtils.isEmpty(id) || StringUtils.isEmpty(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    TkTaskCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkTaskCenterEntity>()
+                .eq(TkTaskCenterEntity::getTenantId, tenantId)
+                .eq(TkTaskCenterEntity::getId, id));
+    return Optional.ofNullable(entity)
+        .map(
+            object -> {
+              TkTaskCenterDTO tkTaskCenterDTO = object.getDTO(TkTaskCenterDTO.class);
+              tkTaskCenterDTO.setExecuteTarget(
+                  JacksonUtil.convertValue(object.getExecuteTarget(), TargetContentDTO.class));
+              tkTaskCenterDTO.setExecuteContent(
+                  JacksonUtil.convertValue(object.getExecuteContent(), TaskTypeDTO.class));
+              tkTaskCenterDTO.setExecuteTime(
+                  JacksonUtil.convertValue(object.getExecuteTime(), TaskExecuteTimeDTO.class));
+              return tkTaskCenterDTO;
+            })
+        .orElse(null);
+  }
+
+  @Override
+  public ListenableFuture<TkTaskCenterDTO> getTaskCenterInfoById(String id) {
+    if (StringUtils.isEmpty(id)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    String key = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS + id;
+    Optional<TkTaskCenterEntity> entityCache = cacheUtils.get(key);
+    TkTaskCenterEntity entity =
+        entityCache.orElseGet(
+            () ->
+                baseMapper.selectOne(
+                    new LambdaQueryWrapper<TkTaskCenterEntity>()
+                        .eq(TkTaskCenterEntity::getId, id)));
+    return Optional.ofNullable(entity)
+        .map(
+            object -> {
+              TkTaskCenterDTO tkTaskCenterDTO = object.getDTO(TkTaskCenterDTO.class);
+              tkTaskCenterDTO.setExecuteTarget(
+                  JacksonUtil.convertValue(object.getExecuteTarget(), TargetContentDTO.class));
+              tkTaskCenterDTO.setExecuteContent(
+                  JacksonUtil.convertValue(object.getExecuteContent(), TaskTypeDTO.class));
+              tkTaskCenterDTO.setExecuteTime(
+                  JacksonUtil.convertValue(object.getExecuteTime(), TaskExecuteTimeDTO.class));
+              return Futures.immediateFuture(tkTaskCenterDTO);
+            })
+        .orElse(null);
+  }
+
+  @Override
+  @Transactional
+  public boolean updateState(String id, Integer state, String tenantId) throws SchedulerException {
+    TkTaskCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkTaskCenterEntity>().eq(TkTaskCenterEntity::getId, id));
+    boolean result = false;
+    if (null == entity) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (!Objects.equals(entity.getTenantId(), tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    entity.setState(state);
+    if (baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO) {
+      String sourceId = entity.getId();
+      SysJobDTO queryJob = tkSysJobService.findSysJobBySourceId(sourceId);
+      if (null == queryJob) {
+        TaskExecuteTimeDTO executeTime =
+            JacksonUtil.convertValue(entity.getExecuteTime(), TaskExecuteTimeDTO.class);
+        if (null == executeTime || StringUtils.isEmpty(executeTime.getCron())) {
+          throw new TkDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
+        }
+        queryJob = new SysJobDTO();
+        queryJob.setSourceId(sourceId);
+        queryJob.setJobName(entity.getName());
+        queryJob.setInvokeTarget("rpcCommandTask.process('" + sourceId + "')");
+        queryJob.setJobGroup(JobGroupEnum.TASK_CENTER.name());
+        queryJob.setCronExpression(executeTime.getCron());
+        queryJob.setTenantId(entity.getTenantId());
+      }
+      queryJob.setStatus(state);
+      tkSysJobService.saveOrUpdateJob(queryJob);
+      result = true;
+    }
+    return result;
+  }
+
+  @Override
+  @Transactional
+  public boolean cancelExecute(String id, String tbDeviceId, String tenantId) {
+    boolean result = false;
+    TkTaskCenterEntity entity = baseMapper.selectById(id);
+    if (entity != null) {
+      if (!Objects.equals(entity.getTenantId(), tenantId)) {
+        throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+      }
+      TargetContentDTO targetContent =
+          JacksonUtil.convertValue(entity.getExecuteTarget(), TargetContentDTO.class);
+      if (null != targetContent) {
+        // 按设备执行
+        if (Objects.equals(entity.getTargetType(), TargetTypeEnum.DEVICES)) {
+          List<String> data = targetContent.getData();
+          List<String> removeResult = new ArrayList<>();
+          if (null != data && !data.isEmpty()) {
+            for (String deviceId : data) {
+              if (!Objects.equals(deviceId, tbDeviceId)) {
+                removeResult.add(deviceId);
+              }
+            }
+            targetContent.setData(removeResult);
+          }
+        } else {
+          // 按产品执行
+          Map<String, List<String>> map = targetContent.getCancelExecuteDevices();
+          DeviceDTO deviceDTO = tkDeviceService.findDeviceInfoByTbDeviceId(tenantId, tbDeviceId);
+          for (String key : map.keySet()) {
+            if (Objects.equals(key, deviceDTO.getDeviceProfileId())) {
+              map.get(key).add(tbDeviceId);
+              break;
+            }
+          }
+        }
+        entity.setExecuteTarget(JacksonUtil.convertValue(targetContent, JsonNode.class));
+        baseMapper.updateById(entity);
+        updateTaskCenterCache(entity);
+      }
+    }
+    return result;
+  }
+
+  private void updateTaskCenterCache(TkTaskCenterEntity entity) {
+    String key = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS + entity.getId();
+    Optional<TkTaskCenterEntity> entityCache = cacheUtils.get(key);
+    if (entityCache.isPresent()) {
+      cacheUtils.put(key, entity);
+    }
+  }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.TkTaskCenterEntity;
+
+@Mapper
+public interface TaskCenterMapper extends BaseMapper<TkTaskCenterEntity> {
+}

 package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
+import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
+
 import java.util.List;
 
 /**
@@ -10,5 +12,5 @@ import java.util.List;
 public interface SysAreaService {
     List<SysAreaDTO> list(SysAreaDTO sysAreaDTO);
 
-    SysAreaDTO getSysAreaInfoByCode(Long code);
+    SysAreaDTO getSysAreaInfoByCode(Long code, AreaLevelEnum levelEnum);
 }

@@ -16,5 +16,28 @@ public interface TkConfigurationCenterService {
 
   boolean deleteConfigurationCenter(DeleteDTO deleteDTO);
 
-  ConfigurationContentInfoDTO getConfigurationInfos(String id,String tenantId);
+  ConfigurationContentInfoDTO getConfigurationInfos(String id, String tenantId);
+
+  ConfigurationCenterDTO getConfigurationCenterInfoById(String id,String tenantId);
+
+  /**
+   * 根据租户ID和数据看板ID，判断是否需要密码
+   *
+   * @param id 数据看板ID
+   * @param tenantId 租户ID
+   * @return 需要true，不需要false
+   */
+  boolean isNeedCredentialsForPublicView(String id, String tenantId);
+
+  /**
+   * 分享或取消分享组态中心
+   *
+   * @param isShare true分享 false取消分享
+   * @param id 组态ID
+   * @param accessCredentials 分享的密码：不用密码则为null
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean shareOrMonopolyConfigurationCenter(
+      boolean isShare, String id, String accessCredentials, String tenantId);
 }

@@ -56,4 +56,23 @@ public interface TkDataBoardService {
    * @return false失败 true成功
    */
   boolean updateDataBoardComponentNum(String id,String tenantId,int count);
+
+  /**
+   * 根据租户ID和数据看板ID，判断是否需要密码
+   * @param id 数据看板ID
+   * @param tenantId 租户ID
+   * @return 需要true，不需要false
+   */
+  boolean isNeedCredentialsForPublicView(String id,String tenantId);
+
+  /**
+   * 分享或取消分享数据刊本
+   * @param isShare 分享
+   * @param id 数据看板ID
+   * @param accessCredentials 访问凭证
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean shareOrMonopolyDataBoard(
+          boolean isShare, String id, String accessCredentials, String tenantId);
 }

@@ -10,17 +10,40 @@ import java.util.Map;
  * @author tianfuLei
  */
 public interface TkDataViewService {
-    TkPageData<TkDataViewDTO> page(Map<String, Object> queryMap, boolean tenantAdmin);
+  TkPageData<TkDataViewDTO> page(Map<String, Object> queryMap, boolean tenantAdmin);
 
-    TkDataViewDTO saveDataView(TkDataViewDTO TkDataViewDTO);
+  TkDataViewDTO saveDataView(TkDataViewDTO TkDataViewDTO);
 
-    TkDataViewDTO updateDataView(TkDataViewDTO TkDataViewDTO);
+  TkDataViewDTO updateDataView(TkDataViewDTO TkDataViewDTO);
 
-    boolean deleteDataView(DeleteDTO deleteDTO);
+  boolean deleteDataView(DeleteDTO deleteDTO);
 
-    TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId);
+  TkDataViewContentInfoDTO getDataViewInfos(String id, String tenantId);
 
-    boolean publishDataView(String id, String tenantId);
+  TkDataViewDTO getDataViewById(String id, String tenantId);
 
-    boolean cancelPublishDataView(String id, String tenantId);
+  /**
+   * 根据租户ID和大屏ID，判断是否需要密码
+   *
+   * @param id 大屏ID
+   * @param tenantId 租户ID
+   * @return 需要true，不需要false
+   */
+  boolean isNeedCredentialsForPublicView(String id, String tenantId);
+
+  /**
+   * 分享或取消分享大屏
+   *
+   * @param isShare true分享 false取消分享
+   * @param id 大屏ID
+   * @param accessCredentials 分享的密码：不用密码则为null
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean shareOrMonopolyDataViewCenter(
+      boolean isShare, String id, String accessCredentials, String tenantId);
+
+  boolean publishDataView(String id, String tenantId);
+
+  boolean cancelPublishDataView(String id, String tenantId);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.springframework.web.bind.annotation.RequestBody;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceRpcDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -27,7 +29,7 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
 
     TkPageData<TkDeviceScriptDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
 
-    List<TkDeviceScriptDTO> findDeviceScript(String tenantId);
+    List<TkDeviceScriptDTO> findDeviceScript(String tenantId,TkScriptFunctionType scriptType);
 
 
     /**
@@ -39,4 +41,12 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
     boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created);
 
     boolean updateScriptStatus(String tenantId,String id,Integer status);
+
+
+    /**
+     * 生成Modebus协议指令
+     * @param params   指令配置对象
+     * @return
+     */
+    String modbus(TkDeviceRpcDTO params);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.thingsboard.server.common.data.DeviceTransportType;
+import com.google.common.util.concurrent.ListenableFuture;import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
@@ -202,4 +202,6 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @return 需要接收RPC控制的网关设备或直连设备的ID
    */
   List<String> rpcDevices(String tenantId,String organizationId,String projectId);
+
+  ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(String deviceProfileId,String tenantId);
 }

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.enums.ShareViewType;
+
+public interface TkShareViewService {
+
+  Object viewShareDataById(ShareViewType shareViewType,String id, String accessCredentials, String tenantId);
+
+  boolean checkPublicViewNeedCredentials(ShareViewType type, String viewId, String tenantId);
+}

 package org.thingsboard.server.dao.yunteng.service;
+
+import com.google.common.util.concurrent.ListenableFuture;
 import org.quartz.SchedulerException;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysJobDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import java.util.List;
 import java.util.Map;
 
-/**
- * 定时任务调度信息信息 服务层
- */
-public interface TkSysJobService
-{
-    /**
-     * 获取quartz调度器的计划任务
-     * 
-     * @param queryMap 查询参数
-     * @return 分页数据
-     */
-    TkPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap);
-
-    /**
-     * 通过调度任务ID查询调度信息
-     * 
-     * @param id 调度任务ID
-     * @return 调度任务对象信息
-     */
-    SysJobDTO selectJobById(String id);
+/** 定时任务调度信息信息 服务层 */
+public interface TkSysJobService {
+  /**
+   * 获取quartz调度器的计划任务
+   *
+   * @param queryMap 查询参数
+   * @return 分页数据
+   */
+  TkPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap);
 
-    /**
-     * 暂停任务
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    SysJobDTO pauseJob(SysJobDTO job) throws SchedulerException;
+  /**
+   * 通过调度任务ID查询调度信息
+   *
+   * @param id 调度任务ID
+   * @return 调度任务对象信息
+   */
+  SysJobDTO selectJobById(String id);
+  /**
+   * 通过调度任务ID查询调度信息
+   *
+   * @param id 调度任务ID
+   * @return 调度任务对象信息
+   */
+  ListenableFuture<SysJobDTO> selectJobInfoById(String id);
+  /**
+   * 暂停任务
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  SysJobDTO pauseJob(SysJobDTO job) throws SchedulerException;
 
-    /**
-     * 恢复任务
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    SysJobDTO resumeJob(SysJobDTO job) throws SchedulerException;
+  /**
+   * 恢复任务
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  SysJobDTO resumeJob(SysJobDTO job) throws SchedulerException;
 
-    /**
-     * 删除任务后，所对应的trigger也将被删除
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    boolean deleteJob(SysJobDTO job) throws SchedulerException;
+  /**
+   * 删除任务后，所对应的trigger也将被删除
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  boolean deleteJob(SysJobDTO job) throws SchedulerException;
 
-    /**
-     * 批量删除调度信息
-     * 
-     * @param deleteDTO 需要删除的数据ID
-     * @return 结果 true删除成功 false删除失败
-     */
-    boolean deleteJobByIds(DeleteDTO deleteDTO) throws SchedulerException;
+  /**
+   * 批量删除定时任务
+   *
+   * @param sourceIds 来源ID即业务ID
+   * @param jobGroup 定时任务分组
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean deleteJobs(List<String> sourceIds, String jobGroup, String tenantId)
+      throws SchedulerException;
 
-    /**
-     * 任务调度状态修改
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    SysJobDTO updateSysJobStatus(SysJobDTO job) throws SchedulerException;
+  /**
+   * 批量删除调度信息
+   *
+   * @param deleteDTO 需要删除的数据ID
+   * @return 结果 true删除成功 false删除失败
+   */
+  boolean deleteJobByIds(DeleteDTO deleteDTO) throws SchedulerException;
 
-    /**
-     * 立即运行任务
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    boolean run(SysJobDTO job) throws SchedulerException;
+  /**
+   * 任务调度状态修改
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  SysJobDTO updateSysJobStatus(SysJobDTO job) throws SchedulerException;
 
-    /**
-     * 新增或编辑任务
-     * 
-     * @param job 调度信息
-     * @return 结果
-     */
-    SysJobDTO saveOrUpdateJob(SysJobDTO job) throws SchedulerException;
+  /**
+   * 立即运行任务
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  boolean run(SysJobDTO job) throws SchedulerException;
 
+  /**
+   * 新增或编辑任务
+   *
+   * @param job 调度信息
+   * @return 结果
+   */
+  SysJobDTO saveOrUpdateJob(SysJobDTO job) throws SchedulerException;
 
-    /**
-     * 校验cron表达式是否有效
-     * 
-     * @param cronExpression 表达式
-     * @return 结果
-     */
-    boolean checkCronExpressionIsValid(String cronExpression);
+  /**
+   * 校验cron表达式是否有效
+   *
+   * @param cronExpression 表达式
+   * @return 结果
+   */
+  boolean checkCronExpressionIsValid(String cronExpression);
 
-    /**
-     * 通过源ID找到定时任务信息
-     * @param sourceId 源ID
-     * @return 定时任务信息
-     */
-    SysJobDTO findSysJobBySourceId(String sourceId);
-}
\ No newline at end of file
+  /**
+   * 通过源ID找到定时任务信息
+   *
+   * @param sourceId 源ID
+   * @return 定时任务信息
+   */
+  SysJobDTO findSysJobBySourceId(String sourceId);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import com.google.common.util.concurrent.ListenableFuture;import org.quartz.SchedulerException;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import java.util.Map;
+
+public interface TkTaskCenterService {
+  /**
+   * 任务中心分页
+   *
+   * @param queryMap 分页查询条件
+   * @param tenantId 租户ID
+   * @return 分页数据
+   */
+  TkPageData<TkTaskCenterDTO> taskCenterPage(Map<String, Object> queryMap, String tenantId);
+
+  /**
+   * 修改或保存任务中心
+   *
+   * @param tkTaskCenterDTO 任务中心信息
+   */
+  TkTaskCenterDTO saveOrUpdateTaskCenter(TkTaskCenterDTO tkTaskCenterDTO) throws SchedulerException;
+
+  /**
+   * 删除任务中心
+   *
+   * @param deleteDTO 删除IDS
+   */
+  boolean deleteTaskCenter(DeleteDTO deleteDTO)throws SchedulerException;
+
+  /**
+   * 根据任务中心ID，查询任务信息
+   * @param id 任务中心ID
+   * @param tenantId 租户ID
+   * @return 任务信息
+   */
+  TkTaskCenterDTO findTaskCenterInfoById(String id,String tenantId);
+
+  /**
+   * 根据任务中心ID，异步查询任务信息
+   * @param id 任务中心ID
+   * @return 任务信息
+   */
+  ListenableFuture<TkTaskCenterDTO> getTaskCenterInfoById(String id);
+
+  /**
+   * 启用禁用任务中心
+   * @param id 任务中心ID
+   * @param state 1启用 0禁用
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean updateState(String id,Integer state,String tenantId)throws SchedulerException;
+
+  /**
+   * 设备取消任务执行
+   * @param id 任务ID
+   * @param tbDeviceId 设备ID
+   * @param tenantId 租户ID
+   * @return true成功 false失败
+   */
+  boolean cancelExecute(String id,String tbDeviceId,String tenantId);
+}

@@ -14,6 +14,8 @@
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
         <result property="thumbnail" column="thumbnail"/>
+        <result property="viewType" column="view_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="accessCredentials" column="access_credentials"/>
         <association property="organizationDTO"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
             <result property="name" column="organization_name"/>
@@ -30,7 +32,8 @@
     </resultMap>
 
     <sql id="columns">
-        a.id,a.name,a.platform,a.organization_id,a.thumbnail, a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
+        a.id,a.name,a.platform,a.organization_id,a.thumbnail, a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,
+        a.updater,io.name AS organization_name,a.view_type,a.access_credentials
     </sql>
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
         SELECT

@@ -35,7 +35,9 @@
         <result property="updater" column="updater"/>
         <result property="description" column="description"/>
         <result property="customerId" column="customer_id"/>
-        <result property="customerName" column="cusotomer_name"/>
+        <result property="customerName" column="customer_name"/>
+        <result property="customerAdditionalInfo" column="customer_additional_info"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="organizationId" column="organization_id"/>
         <result property="gatewayId" column="gateway_id"/>
         <result property="gatewayName" column="gateway_name"/>
@@ -83,7 +85,7 @@
     </sql>
     <select id="getDevicePage" resultMap="deviceMap">
         SELECT
-        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS cusotomer_name
+        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS customer_name,cus.additional_info AS customer_additional_info
         FROM tk_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.id::TEXT
         LEFT JOIN tk_organization io ON io.id = ifd.organization_id

@@ -14,6 +14,8 @@
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
         <result property="thumbnail" column="thumbnail"/>
+        <result property="accessCredentials" column="access_credentials"/>
+        <result property="viewType" column="view_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <association property="organizationDTO"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
             <result property="name" column="organization_name"/>
@@ -34,7 +36,8 @@
     </resultMap>
 
     <sql id="columns">
-        a.id,a.name, a.remark,a.state,a.tenant_id,a.organization_id,a.thumbnail,a.updater,a.update_time,a.create_time,a.creator,io.name AS organization_name
+        a.id,a.name, a.remark,a.state,a.tenant_id,a.organization_id,a.thumbnail,a.updater,a.update_time,a.create_time,
+        a.creator,io.name AS organization_name,a.access_credentials,a.view_type
     </sql>
     <select id="getDataViewPage" resultMap="dataViewMap">
         SELECT