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

lijianfa_14810364212
1 parent bc98f5e8
Showing 4 changed files with 17 additions and 7 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @b3df49e
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @b3df49e
@@ -318,6 +318,7 @@ public abstract class BaseController {
     @ExceptionHandler(Exception.class)
     public void handleControllerException(Exception e, HttpServletResponse response) {
+        log.error(e.getMessage(),e);
         ThingsboardException thingsboardException = handleException(e);
         if (thingsboardException.getErrorCode() == ThingsboardErrorCode.GENERAL && thingsboardException.getCause() instanceof Exception
                 && StringUtils.equals(thingsboardException.getCause().getMessage(), thingsboardException.getMessage())) {
@@ -330,6 +331,7 @@ public abstract class BaseController {
     @ExceptionHandler(ThingsboardException.class)
     public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
+        log.error(ex.getMessage(),ex);
         errorResponseHandler.handle(ex, response);
     }
@@ -393,6 +395,7 @@ public abstract class BaseController {
      * */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public void handleValidationError(MethodArgumentNotValidException validationError, HttpServletResponse response) {
+        log.error(validationError.getMessage(),validationError);
         List<ConstraintViolation<Object>> constraintsViolations = validationError.getFieldErrors().stream()
                 .map(fieldError -> {
                     try {
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
View file @b3df49e
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
View file @b3df49e
@@ -53,6 +53,10 @@ public class RuleChainMetaData {
         connectionInfo.setFromIndex(fromIndex);
         connectionInfo.setToIndex(toIndex);
         connectionInfo.setType(type);
+        addConnectionInfo(connectionInfo);
+    }
+
+    public void addConnectionInfo(NodeConnectionInfo connectionInfo) {
         if (connections == null) {
             connections = new ArrayList<>();
         }
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @b3df49e
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @b3df49e
@@ -164,7 +164,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         List<EntityRelation> relations = new ArrayList<>();
         Map<RuleNodeId, Integer> ruleNodeIndexMap = new HashMap<>();
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             for (RuleNode node : nodes) {
                 setSingletonMode(node);
                 if (node.getId() != null) {
@@ -191,7 +191,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             updatedRuleNodes.add(new RuleNodeUpdateResult(existingNode, newRuleNode));
         }
         RuleChainId ruleChainId = ruleChain.getId();
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             for (RuleNode node : toAddOrUpdate) {
                 node.setRuleChainId(ruleChainId);
                 node = ruleNodeUpdater.apply(node);
@@ -208,7 +208,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             deleteRuleNodes(tenantId, toDelete);
         }
         RuleNodeId firstRuleNodeId = null;
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             if (ruleChainMetaData.getFirstNodeIndex() != null) {
                 firstRuleNodeId = nodes.get(ruleChainMetaData.getFirstNodeIndex()).getId();
             }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
View file @b3df49e
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
View file @b3df49e
@@ -431,7 +431,10 @@ public class TkConvertConfigServiceImpl
   private void freshRuleChainMetaData(RuleChainMetaData ruleChainMetaData, int removeNodeIndex) {
     ruleChainMetaData.getNodes().remove(removeNodeIndex);
-    int firstIndex = ruleChainMetaData.getFirstNodeIndex();
+    Integer firstIndex = ruleChainMetaData.getFirstNodeIndex();
+    if(firstIndex==null){
+      return;
+    }
     ruleChainMetaData.setFirstNodeIndex(
         Math.max(firstIndex < removeNodeIndex ? firstIndex : firstIndex - 1, 0));
@@ -834,7 +837,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size() - 2);
                   nodeConnectionInfo.setType(connectionType);
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 if (node.getName().equals(sceneOriginatorName)
                     && node.getType().equals(originatorType)) {
@@ -842,7 +845,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size() - 1);
                   nodeConnectionInfo.setType(connectionType);
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 if (node.getType().equals("org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode")) {
@@ -850,7 +853,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleChainMetaData.getNodes().size() - 1);
                   nodeConnectionInfo.setToIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setType("RPC Request");
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 ruleNodeIndex.getAndIncrement();
               });