Merge remote-tracking branch 'origin/master_dev' into master_dev

+-- **************************
+-- ********表结构升级********
+-- **************************
+
+
+
+
+
+
+
+
+
+
+
+
+
+-- **************************
+-- ********表数据同步********
+-- **************************
+UPDATE "public"."tk_data_view_interface" SET "interface_name" = '实时单属性值(适合自定义文字)', "request_content_type" = 2, "request_origin_url" = 'localhost', "request_http_type" = NULL, "request_url" = '/api/ws/plugins/telemetry', "request_params" = '{"requestSQLContent":{},"Params":[{"key":"deviceProfileId,organizationId,entityId,keys","value":"","mores":null,"editDisabled":true,"required":true}]}', "state" = 1, "creator" = '80808080-8080-8080-8080-808080808080', "create_time" = '2023-07-08 10:27:53.643059', "updater" = '80808080-8080-8080-8080-808080808080', "update_time" = '2023-07-08 10:33:29.088113', "tenant_id" = '13814000-1dd2-11b2-8080-808080808080', "remark" = NULL, "interface_type" = 'SYSTEM', "filter" = 'const {
+  data
+} = res
+
+//只有一个属性的脚本编写
+
+//获取服务端返回的keys,比如温度等
+const keys = Object.keys(data)
+
+//把二维数组转化为对象
+const transObj = Object.fromEntries(data[keys[0]])
+
+const key = Object.keys(transObj)
+return new String(transObj[key[0]])' WHERE "id" = '3cf86107-5973-4246-b915-2eda1f3e7cf6';
+
+
+
+
+
+
+
+
+
+-- ****************************
+-- ********业务功能升级********
+-- ****************************
+
+
+
+------------------------------------------------------------------------------------
+---------【租户角色对应菜单同步】---------------------------------------------------------------
+------------------------------------------------------------------------------------
+-- 租户角色不能分配超级管理员的权限
+
+

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -157,6 +158,7 @@ public class TkAdminController extends BaseController {
   }
   }
 
 
   @PostMapping("/tenant/adminUser")
   @PostMapping("/tenant/adminUser")
+  @Transactional
   @PreAuthorize(
   @PreAuthorize(
       "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
       "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
   public ResponseEntity<UserDTO> createTenantAdmin(
   public ResponseEntity<UserDTO> createTenantAdmin(
@@ -207,6 +209,7 @@ public class TkAdminController extends BaseController {
   }
   }
 
 
   @PostMapping("tenant/updateOrCreateTenant")
   @PostMapping("tenant/updateOrCreateTenant")
+  @Transactional
   public TenantDTO updateOrCreateTenant(
   public TenantDTO updateOrCreateTenant(
       @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO)
       @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO)
       throws ThingsboardException {
       throws ThingsboardException {

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
@@ -63,6 +64,7 @@ public class TkDeviceController extends BaseController {
   private final GatewayNotificationsService gatewayNotificationsService;
   private final GatewayNotificationsService gatewayNotificationsService;
 
 
   @PostMapping
   @PostMapping
+  @Transactional
   @ApiOperation("创建|编辑")
   @ApiOperation("创建|编辑")
   @PreAuthorize(
   @PreAuthorize(
       "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:post','api:yt:device:update'})")
       "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:device:post','api:yt:device:update'})")

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -50,6 +51,7 @@ public class TkDeviceProfileController extends BaseController {
   private final TkDeviceProfileService tkDeviceProfileService;
   private final TkDeviceProfileService tkDeviceProfileService;
 
 
   @PostMapping()
   @PostMapping()
+  @Transactional
   @PreAuthorize(
   @PreAuthorize(
       "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})")
       "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:post','api:yt:deviceProfile:update'})")
   @ApiOperation("创建 | 编辑")
   @ApiOperation("创建 | 编辑")

@@ -124,7 +124,7 @@ public class TbSendRPCRequestNode implements TbNode {
                 params = JacksonUtil.toString(methodParams);
                 params = JacksonUtil.toString(methodParams);
             }
             }
             ObjectNode additional = JacksonUtil.newObjectNode();
             ObjectNode additional = JacksonUtil.newObjectNode();
-            if(StringUtils.isNotBlank(additionalInfo)){
+            if(!json.get(DataConstants.ADDITIONAL_INFO).isJsonNull()){
                 additional = (ObjectNode) JacksonUtil.toJsonNode(additionalInfo);
                 additional = (ObjectNode) JacksonUtil.toJsonNode(additionalInfo);
             }
             }
             if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){
             if(!additional.has(FastIotConstants.Rpc.TARGET_ID)){

@@ -328,7 +328,7 @@ class ReactState {
     TbMsgMetaData metaData = msg.getMetaData();
     TbMsgMetaData metaData = msg.getMetaData();
     metaData.putValue(DataConstants.PERSISTENT, "true");
     metaData.putValue(DataConstants.PERSISTENT, "true");
     metaData.putValue(
     metaData.putValue(
-        FastIotConstants.Rpc.ONEWAY, (callType == CallTypeEnum.SYNC ? true : false) + "");
+        FastIotConstants.Rpc.ONEWAY, (callType == CallTypeEnum.SYNC ? false : true) + "");
     for (String id : devices) {
     for (String id : devices) {
       TbMsg newMsg =
       TbMsg newMsg =
           ctx.newMsg(
           ctx.newMsg(