Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution

auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java

@@ -97,6 +97,19 @@ public class BehaviortreeController extends BaseController
         return toAjax(behaviortreeProcessor.create(behaviortree));
     }
 
+    /**
+     * 复制行为树
+     */
+    @ApiOperation("复制行为树")
+    @PreAuthorize("@ss.hasPermi('system:behaviortree:add')")
+    @Log(title = "行为树主", businessType = BusinessType.INSERT)
+    @PostMapping("/copy")
+    public AjaxResult copy(@RequestBody Behaviortree behaviortree)
+    {
+        //return toAjax(behaviortreeService.copy(behaviortree));
+        return toAjax(behaviortreeProcessor.copy(behaviortree));
+    }
+
     /**
      * 修改行为树主
      */

auto-solution-admin/src/main/java/com/solution/web/core/BehaviortreeProcessor.java

@@ -8,8 +8,10 @@ package com.solution.web.core;
  * that was distributed with this source code.
  */
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.solution.common.constant.ExceptionConstants;
 import com.solution.system.domain.*;
 import com.solution.system.service.IBehaviortreeService;
 import com.solution.system.service.INodeconnectionService;
@@ -20,6 +22,7 @@ import com.solution.web.core.graph.GraphEdge;
 import com.solution.web.core.graph.GraphNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -56,6 +59,7 @@ public class BehaviortreeProcessor {
         return result;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public int update(Behaviortree behaviortree) {
         int result = behaviortreeService.updateBehaviortree(behaviortree);
 
@@ -74,7 +78,7 @@ public class BehaviortreeProcessor {
     }
 
     private void processGraph(Behaviortree behaviortree) {
-
+        //代码丢失 原:libertyspy 改:MHW
         Graph graph = null;
         try {
             graph = objectMapper.readValue(behaviortree.getXmlContent(), Graph.class);
@@ -223,4 +227,23 @@ public class BehaviortreeProcessor {
     }
 
 
+    /**
+     * 复制行为树
+     * @param behaviortree
+     * @return
+     */
+    public int copy(Behaviortree behaviortree) {
+        if(ObjectUtil.isEmpty(behaviortree)){
+            throw new RuntimeException(ExceptionConstants.PARAMETER_EXCEPTION);
+        }
+        String name = behaviortree.getName();
+        String newName =  name + "_" + behaviortree.getId();
+
+        String englishName = behaviortree.getEnglishName();
+        String newEnglishName =  englishName + "_" + behaviortree.getId();
+        behaviortree.setEnglishName(newEnglishName);
+        behaviortree.setName(newName);
+
+        return this.create(behaviortree);
+    }
 }