fix: 场景联动执行条件或触发器为空异常修复

云中非
1 parent acfb186d
Showing 1 changed file with 41 additions and 41 deletions
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
View file @82ab51e
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
View file @82ab51e
@@ -3,15 +3,12 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -22,8 +19,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.yunteng.ConvertConfig;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
@@ -182,8 +177,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
             }
-        } else {
-            return;
         }
         // 先删除触发器
@@ -194,15 +187,17 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         // 如果获取的触发器不为空,进行添加操作
-        List<Trigger> triggers =
-                triggerDTOS.stream()
-                        .map(triggerDTO -> {
-                            triggerDTO.setTenantId(sceneLinkage.getTenantId());
-                            triggerDTO.setSceneLinkageId(sceneLinkage.getId());
-                            return triggerDTO.getEntity(Trigger.class);
-                        })
-                        .collect(Collectors.toList());
-        triggerService.insertBatch(triggers, 1000);
+        if(triggerDTOS != null && !triggerDTOS.isEmpty()){
+            List<Trigger> triggers =
+                    triggerDTOS.stream()
+                            .map(triggerDTO -> {
+                                triggerDTO.setTenantId(sceneLinkage.getTenantId());
+                                triggerDTO.setSceneLinkageId(sceneLinkage.getId());
+                                return triggerDTO.getEntity(Trigger.class);
+                            })
+                            .collect(Collectors.toList());
+            triggerService.insertBatch(triggers, 1000);
+        }
     }
     /**
@@ -238,22 +233,24 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                         .lambda()
                         .eq(StringUtils.isNoneBlank(sceneLinkageDTO.getId()), DoAction::getSceneLinkageId, sceneLinkageDTO.getId()));
+        if (actionDTOS != null && !actionDTOS.isEmpty()) {
+            List<DoAction> collectA =
+                    actionDTOS.stream()
+                            .map(doActionDTO -> {
+                                doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
+                                doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
+                                if (ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())) {
+                                    ObjectNode doContext = JacksonUtil.newObjectNode();
+                                    doContext.put("method", "methodThingskit");
+                                    doContext.put("params", doActionDTO.getDoContext());
+                                    doActionDTO.setDoContext(doContext);
+                                }
+                                return doActionDTO.getEntity(DoAction.class);
+                            })
+                            .collect(Collectors.toList());
+            doActionService.insertBatch(collectA, 1000);
-        List<DoAction> collectA =
-                sceneLinkageDTO.getDoActions().stream()
-                        .map(doActionDTO -> {
-                            doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
-                            doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
-                            if (ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())) {
-                                ObjectNode doContext = JacksonUtil.newObjectNode();
-                                doContext.put("method", "methodThingskit");
-                                doContext.put("params", doActionDTO.getDoContext());
-                                doActionDTO.setDoContext(doContext);
-                            }
-                            return doActionDTO.getEntity(DoAction.class);
-                        })
-                        .collect(Collectors.toList());
-        doActionService.insertBatch(collectA, 1000);
+        }
     }
@@ -293,17 +290,20 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         // 4.批量新增执行条件
-        List<DoCondition> collectC =
-                sceneLinkageDTO.getDoConditions().stream()
-                        .map(doConditionDTO -> {
+        if (conditionDTOS != null && !conditionDTOS.isEmpty()) {
+            List<DoCondition> collectC =
+                    conditionDTOS.stream()
+                            .map(doConditionDTO -> {
+
+                                        doConditionDTO.setTenantId(sceneLinkageDTO.getTenantId());
+                                        doConditionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
+                                        return doConditionDTO.getEntity(DoCondition.class);
+                                    }
+                            )
+                            .collect(Collectors.toList());
+            doConditionService.insertBatch(collectC, 1000);
-                                    doConditionDTO.setTenantId(sceneLinkageDTO.getTenantId());
-                                    doConditionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
-                                    return doConditionDTO.getEntity(DoCondition.class);
-                                }
-                        )
-                        .collect(Collectors.toList());
-        doConditionService.insertBatch(collectC, 1000);
+        }
     }
     /**