Merge branch '20220301' into 'master'

fix: 修复脚本转换脚本阻塞RPC调用

See merge request huang/thingsboard3.3.2!52

@@ -137,7 +137,7 @@ public class YtDeviceProfileController extends BaseController {
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
 
 
-        PageLink pageLink = createPageLink(pageSize, page > 1 ? page - 1 : 0, name, orderBy, orderType == null ? "" : orderType.name());
+        PageLink pageLink = createPageLink(pageSize, page > 1 ? page - 1 : 0, name, orderBy==null ? "createdTime":orderBy, orderType == null ? OrderTypeEnum.DESC.name(): orderType.name());
         return ytDeviceProfileService.page(pageLink, getCurrentUser().getCurrentTenantId(), transportType);
         return ytDeviceProfileService.page(pageLink, getCurrentUser().getCurrentTenantId(), transportType);
     }
     }
 
 

@@ -373,11 +373,17 @@ public class ConvertConfigServiceImpl
     int newFirstNodeIndex = ruleChainMetaData.getNodes().size() - 1;
     int newFirstNodeIndex = ruleChainMetaData.getNodes().size() - 1;
     ruleChainMetaData.setFirstNodeIndex(newFirstNodeIndex);
     ruleChainMetaData.setFirstNodeIndex(newFirstNodeIndex);
     // 3. Add Connection
     // 3. Add Connection
+    NodeConnectionInfo failedConnectionInfo = new NodeConnectionInfo();
+    failedConnectionInfo.setFromIndex(newFirstNodeIndex);
+    failedConnectionInfo.setType("Failure");
+    failedConnectionInfo.setToIndex(firstNodeIndex);
+
     NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
     NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
     nodeConnectionInfo.setFromIndex(newFirstNodeIndex);
     nodeConnectionInfo.setFromIndex(newFirstNodeIndex);
     nodeConnectionInfo.setType(connectionType);
     nodeConnectionInfo.setType(connectionType);
     nodeConnectionInfo.setToIndex(firstNodeIndex);
     nodeConnectionInfo.setToIndex(firstNodeIndex);
     ruleChainMetaData.getConnections().add(nodeConnectionInfo);
     ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+    ruleChainMetaData.getConnections().add(failedConnectionInfo);
   }
   }
 
 
   private void addSceneRuleNode(RuleNode ruleNode, RuleChainMetaData ruleChainMetaData) {
   private void addSceneRuleNode(RuleNode ruleNode, RuleChainMetaData ruleChainMetaData) {

@@ -124,6 +124,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         if (sceneLinkage == null) {
         if (sceneLinkage == null) {
             throw new YtDataValidationException("此场景已不存在");
             throw new YtDataValidationException("此场景已不存在");
         }
         }
+        if (!sceneLinkage.getCreator().equals(currentUserId)) {
+            throw new YtDataValidationException("你不是此场景的创建者");
+        }
         String organizationId = sceneLinkage.getOrganizationId();
         String organizationId = sceneLinkage.getOrganizationId();
         List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantAdmin,tenantId,currentUserId);
         List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantAdmin,tenantId,currentUserId);
 
 
@@ -277,10 +280,8 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         if (null != organizationId && !StringUtils.isEmpty(organizationId)) {
         if (null != organizationId && !StringUtils.isEmpty(organizationId)) {
             queryMap.put("organizationIds", getQueryOrganizationIds(tenantId, Arrays.asList(organizationId)));
             queryMap.put("organizationIds", getQueryOrganizationIds(tenantId, Arrays.asList(organizationId)));
         }
         }
-        if (null == organizationId && isCustomerUser) {
-            String currentUserId = (String) queryMap.get("currentUser");
-            List<String> ids = userOrganizationMappingService.getOrganizationIdsByUserId(currentUserId);
-            queryMap.put("organizationIds", getQueryOrganizationIds(tenantId, ids));
+        if (!isCustomerUser) {
+            queryMap.remove("currentUser");
         }
         }
         IPage<SceneLinkage> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<SceneLinkage> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);
         IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);

@@ -42,6 +42,9 @@
                     #{organizationId}
                     #{organizationId}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="queryMap.currentUser !=null">
+                AND s.creator = #{queryMap.currentUser}
+            </if>
         </where>
         </where>
     </select>
     </select>