feat: tree modified

web/src/main/java/seecoder/devcloud/web/controller/tree/TreeNodesController.java

@@ -1,6 +1,8 @@
 package seecoder.devcloud.web.controller.tree;
 
 
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import seecoder.devcloud.web.po.TreeNodePO;
@@ -12,7 +14,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/tree")
 /**
- * @Author chenyz
+ * @Author cyz,xzh
  * @Description 需求树相关操作
  */
 public class TreeNodesController {
@@ -31,14 +33,17 @@ public class TreeNodesController {
      */
     @GetMapping("/{projectId}")
     public Response listTreeNodesByProjectId(@PathVariable("projectId") int projectId){
-        // TODO
-        return null;
+        return treeNodeService.listTreeNodesByProjectId(projectId);
     }
 
 
-    @PostMapping("/addNode")
+    @PostMapping("/node")
     public Response insertTreeNode(){
         return null;
     }
 
+    @DeleteMapping("/node/{nodeId}")
+    public Response deleteTreeNode(@PathVariable("nodeId") int nodeId) {
+        return Response.ok(treeNodeService.deleteTreeNode(nodeId));
+    }
 }

web/src/main/java/seecoder/devcloud/web/dao/tree/TreeNodeMapper.java

@@ -75,4 +75,9 @@ public interface TreeNodeMapper {
     @UpdateProvider(type = TreeNodeProvider.class,method = "updateTreeNode")
     int updateTreeNode(TreeNodePO TreeNodePO);
 
+    @Delete("delete from tree_nodes where id = #{nodeId}")
+    int deleteTreeNode(@Param("nodeId") int nodeId);
+
+//    @Delete("delete from group_member where group_id = #{groupId} and user_id = #{userId}")
+//    int delete(@Param("groupId") int groupId,@Param("userId")  int userId);
 }

web/src/main/java/seecoder/devcloud/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -23,9 +23,10 @@ public class TreeNodeServiceImpl implements TreeNodeService {
 
     @Override
     public Response listTreeNodesByProjectId(int projectId) {
-        // TODO:safety check
-        return Response.ok(treeNodeMapper.listTreeNodesByProjectId(projectId));
+        List<TreeNodePO> result = treeNodeMapper.listTreeNodesByProjectId(projectId);
+        return Response.ok(result);
     }
+    
 
     @Override
     public Response insertTreeNode(TreeNodeVO treeNodeVO) {
@@ -33,6 +34,9 @@ public class TreeNodeServiceImpl implements TreeNodeService {
         BeanUtils.copyProperties(treeNodeVO,treeNodePO);
         int res = treeNodeMapper.insertTreeNode(treeNodePO);
         // TODO:safety check
+        if (res <= 0) {
+            return Response.serverInternalError("Insert failed!");
+        }
         return Response.ok();
     }
 
@@ -46,8 +50,10 @@ public class TreeNodeServiceImpl implements TreeNodeService {
     }
 
     @Override
-    public Response deleteTreeNode(TreeNodeVO treeNodeVO) {
-        return null;
+    public Response deleteTreeNode(int nodeId) {
+        treeNodeMapper.deleteTreeNode(nodeId);
+        // TODO:safety check
+        return Response.ok();
     }
 
 }

web/src/main/java/seecoder/devcloud/web/service/tree/TreeNodeService.java

@@ -34,9 +34,9 @@ public interface TreeNodeService {
     Response updateTreeNode(TreeNodeVO treeNodeVO);
 
     /**
-     * 删除一条需求
-     * @param treeNodeVO
+     * 删除一条需求,级联删除消息
+     * @param nodeId
      * @return
      */
-    Response deleteTreeNode(TreeNodeVO treeNodeVO);
+    Response deleteTreeNode(int nodeId);
 }

web/src/main/resources/application-xzh.yml

@@ -0,0 +1,55 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/devcloud?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    username: root
+    password: xizhiheng921
+
+  mail:
+    host: smtp.qq.com
+    username: 370774330@qq.com
+    password: qkoecnzivukvbibi
+    port: 465
+    protocol: smtp
+    properties:
+      mail:
+        smtp:
+          ssl:
+            enable: true
+          socketFactory.class: javax.net.ssl.SSLSocketFactory
+        debug: true
+server:
+  port: 8080
+
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+
+seecoder:
+  k8s:
+    api-server: https://192.168.99.105:8443
+    token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjBmSXc4RlRjNUpBYVpGYWc4QzRDY1MzUWJad1JMdFhKcDI1cngzWGtiRlkifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZXZjbG91ZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJkZWZhdWx0LXRva2VuLXNicXY4Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImRlZmF1bHQiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI5NmIxNzU1ZS0zZjE3LTQ1ZTctODFmYi01MTRhODA3NDRhMzQiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGV2Y2xvdWQ6ZGVmYXVsdCJ9.W0Y1lR6LBi1ZjylBx35YeqYuq2u2AqH-ayK4FD-LDfC26E89DanOwSv9XLrRMnnDBZFS_ZCRBumbnDeMiS5vw2x7-QnrDqj1M5u9FB2fIJsz2LyUkOhATZZmTzj_Uhewvvg09aDKh16ttj6ZX27m-KVk_6MP-VfiuvZnCVxDbqRkRjK-zsor4ty1CEATPyKK-tvugAwS0RFNHUL94DamfZAq_t1PSnH5ZtEHq0uEMZxY2c7j6u9d_aD9lphm_ZpCy_C8OCHfanM21CQPDHlcJTW_aiOO6bAp8qdc1egPO5uIamHl6Zm0N3RkcsRp4DGOHrltTV9y_cGZHXSWmRHfxw
+    debugging: true
+  gitlab:
+    host: http://gitlab.192.168.99.105.nip.io
+    webHookProxy: http://localhost:3000
+    token: wXDeETv2Kmt-JhiApJ9H
+  mail:
+    from: 370774330@qq.com
+
+
+  jenkins:
+    host: http://192.168.68.79:8082
+    username: root
+    token: 11d7b9e4c1acac481904c25813e2ec1f0a
+  docker:
+    registry: 192.168.68.79:18082
+
+
+
+  registry:
+    host: 192.168.68.79:18082
+    username: admin
+    password: admin123
+    nexus-server: 192.168.68.79:18081
+    repo-name: sec-repo
+    clean-up-task: 83bb8249-71e8-4367-83b3-50c6f7518860