fix:解决场景联动与规则链的关联关系BUG

@@ -224,7 +224,7 @@ public class TkConvertDataToController extends BaseController {
     Integer sceneStatus = convertReqDTO.getStatus();
     Integer sceneStatus = convertReqDTO.getStatus();
     JsonNode configuration =
     JsonNode configuration =
         sceneLinkageService.getRuleNodeConfig(
         sceneLinkageService.getRuleNodeConfig(
-            sceneId,
+            sceneId, querySceneLink.getRuleChainId(),
             currentTenant,
             currentTenant,
             getCurrentUser().getCustomerId().getId().toString(),
             getCurrentUser().getCustomerId().getId().toString(),
             sceneStatus);
             sceneStatus);

@@ -602,6 +602,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
 
 
                 } else {
                 } else {
+                    log.error("updateInactivityStateIfExpired isMyPartition=false , serverType={},tenantId={},deviceId={}",ServiceType.TB_CORE,stateData.getTenantId(),deviceId);
                     cleanupEntity(deviceId);
                     cleanupEntity(deviceId);
                 }
                 }
             }
             }
@@ -617,7 +618,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         state.setLastInactivityAlarmTime(ts);
         state.setLastInactivityAlarmTime(ts);
         save(deviceId, INACTIVITY_ALARM_TIME, ts);
         save(deviceId, INACTIVITY_ALARM_TIME, ts);
         onDeviceActivityStatusChange(deviceId, false, stateData);
         onDeviceActivityStatusChange(deviceId, false, stateData);
-        System.err.println("Inactivity Device : "+deviceId);
     }
     }
 
 
     boolean isActive(long ts, DeviceState state) {
     boolean isActive(long ts, DeviceState state) {

@@ -41,7 +41,7 @@ public class UserDTO extends BaseDTO {
   private String[] roleIds;
   private String[] roleIds;
 
 
   @ApiModelProperty(value = "电话号码")
   @ApiModelProperty(value = "电话号码")
-//  @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)
+  @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)
   private String phoneNumber;
   private String phoneNumber;
 
 
   @ApiModelProperty(value = "邮箱")
   @ApiModelProperty(value = "邮箱")

@@ -473,11 +473,12 @@ public class TkSceneLinkageServiceImpl
    */
    */
   @Override
   @Override
   public JsonNode getRuleNodeConfig(
   public JsonNode getRuleNodeConfig(
-          String currentSceneId, String tenantId, String customerId, Integer state) {
+          String currentSceneId, String ruleChainId,String tenantId, String customerId, Integer state) {
     List<TkSceneLinkageEntity> runningScenes =
     List<TkSceneLinkageEntity> runningScenes =
             baseMapper.selectList(
             baseMapper.selectList(
                     new LambdaQueryWrapper<TkSceneLinkageEntity>()
                     new LambdaQueryWrapper<TkSceneLinkageEntity>()
                             .eq(TkSceneLinkageEntity::getTenantId, tenantId)
                             .eq(TkSceneLinkageEntity::getTenantId, tenantId)
+                            .eq(TkSceneLinkageEntity::getRuleChainId,ruleChainId)
                             .eq(TkSceneLinkageEntity::getStatus, FastIotConstants.StateValue.ENABLE));
                             .eq(TkSceneLinkageEntity::getStatus, FastIotConstants.StateValue.ENABLE));
     Set<String> enableIds = new HashSet<>();
     Set<String> enableIds = new HashSet<>();
     Map<String, String> sceneInform = new HashMap<>();
     Map<String, String> sceneInform = new HashMap<>();

@@ -87,7 +87,7 @@ public interface SceneLinkageService extends BaseService<TkSceneLinkageEntity>{
      * @param state     是否启动
      * @param state     是否启动
      * @return
      * @return
      */
      */
-    JsonNode getRuleNodeConfig(String sceneId,String tenantId,String customerId,Integer state);
+    JsonNode getRuleNodeConfig(String sceneId,String ruleChainId,String tenantId,String customerId,Integer state);
 
 
     /**
     /**
      * 详情
      * 详情