From 03bf3f3ba9fcd3872a9bfc4da43d7bf15f062c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Mon, 26 Aug 2024 10:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E6=9B=B4=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB,=E4=BC=98=E5=8C=96=E4=BA=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/quest/domain/Node.java |  60 ++++++-----
 .../main/java/com/muyu/quest/req/NodeReq.java |   2 +
 .../java/com/muyu/quest/resp/NodeResp.java    |  36 +++----
 .../muyu/quest/controller/NodeController.java |  20 ++--
 .../muyu/quest/controller/TaskController.java |   3 +-
 .../quest/service/impl/NodeServiceImpl.java   |   3 +
 .../resources/mapper/quest/NodeMapper.xml     | 101 ------------------
 7 files changed, 67 insertions(+), 158 deletions(-)
 delete mode 100644 muyu-quest-server/src/main/resources/mapper/quest/NodeMapper.xml

diff --git a/muyu-quest-common/src/main/java/com/muyu/quest/domain/Node.java b/muyu-quest-common/src/main/java/com/muyu/quest/domain/Node.java
index 8654495..61fc877 100644
--- a/muyu-quest-common/src/main/java/com/muyu/quest/domain/Node.java
+++ b/muyu-quest-common/src/main/java/com/muyu/quest/domain/Node.java
@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@TableName("node_source")
+@TableName("node_info")
 public class Node extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
@@ -37,24 +37,32 @@ public class Node extends BaseEntity{
     @Excel(name = "节点编码")
     private String nodeCode;
 
+    /** 任务编码 */
+    @Excel(name = "任务编码")
+    private String taskCode;
+
+    /** 节点类型 */
+    @Excel(name = "节点类型")
+    private String nodeType;
+
     /** 节点名称 */
     @Excel(name = "节点名称")
     private String nodeName;
 
-    /** 节点入参 */
-    @Excel(name = "节点入参")
-    private String nodeReq;
+    /** 节点位置Y */
+    @Excel(name = "节点位置Y")
+    private String nodePositionTop;
 
-    /** 节点出参 */
-    @Excel(name = "节点出参")
-    private String nodeResp;
+    /** 节点位置X */
+    @Excel(name = "节点位置X")
+    private String nodePositionLeft;
 
-    /** 上一级节点 */
-    @Excel(name = "上一级节点")
+    /** 节点上一级 */
+    @Excel(name = "节点上一级")
     private String nodePreCode;
 
-    /** 下一级节点 */
-    @Excel(name = "下一级节点")
+    /** 节点下一级 */
+    @Excel(name = "节点下一级")
     private String nodeNextCode;
 
     /** 启用状态 */
@@ -67,19 +75,21 @@ public class Node extends BaseEntity{
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("nodeCode", getNodeCode())
-            .append("nodeName", getNodeName())
-            .append("nodeReq", getNodeReq())
-            .append("nodeResp", getNodeResp())
-            .append("nodePreCode", getNodePreCode())
-            .append("nodeNextCode", getNodeNextCode())
-            .append("state", getState())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+                .append("id", getId())
+                .append("nodeCode", getNodeCode())
+                .append("taskCode", getTaskCode())
+                .append("nodeType", getNodeType())
+                .append("nodeName", getNodeName())
+                .append("nodePositionTop", getNodePositionTop())
+                .append("nodePositionLeft", getNodePositionLeft())
+                .append("nodePreCode", getNodePreCode())
+                .append("nodeNextCode", getNodeNextCode())
+                .append("state", getState())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }
diff --git a/muyu-quest-common/src/main/java/com/muyu/quest/req/NodeReq.java b/muyu-quest-common/src/main/java/com/muyu/quest/req/NodeReq.java
index cece0ba..bfebc8b 100644
--- a/muyu-quest-common/src/main/java/com/muyu/quest/req/NodeReq.java
+++ b/muyu-quest-common/src/main/java/com/muyu/quest/req/NodeReq.java
@@ -18,6 +18,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @AllArgsConstructor
 public class NodeReq{
 
+    /** 任务编码 */
+    private String taskCode;
 
     /** 节点名称 */
     private String nodeName;
diff --git a/muyu-quest-common/src/main/java/com/muyu/quest/resp/NodeResp.java b/muyu-quest-common/src/main/java/com/muyu/quest/resp/NodeResp.java
index dd0edc0..d24eef1 100644
--- a/muyu-quest-common/src/main/java/com/muyu/quest/resp/NodeResp.java
+++ b/muyu-quest-common/src/main/java/com/muyu/quest/resp/NodeResp.java
@@ -1,5 +1,6 @@
 package com.muyu.quest.resp;
 
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.enums.SysYesNo;
 import com.muyu.quest.domain.Node;
 import lombok.*;
@@ -25,14 +26,20 @@ public class NodeResp{
     /** 节点编码 */
     private String nodeCode;
 
+    /** 任务编码 */
+    private String taskCode;
+
     /** 节点名称 */
     private String nodeName;
 
-    /** 节点入参 */
-    private String nodeReq;
+    /** 节点类型 */
+    private String nodeType;
 
-    /** 节点出参 */
-    private String nodeResp;
+    /** 节点位置Y */
+    private String nodePositionTop;
+
+    /** 节点位置X */
+    private String nodePositionLeft;
 
     /** 上一级节点 */
     private String nodePreCode;
@@ -44,28 +51,15 @@ public class NodeResp{
     private String state;
 
 
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("nodeCode", getNodeCode())
-            .append("nodeName", getNodeName())
-            .append("nodeReq", getNodeReq())
-            .append("nodeResp", getNodeResp())
-            .append("nodePreCode", getNodePreCode())
-            .append("nodeNextCode", getNodeNextCode())
-            .append("state", getState())
-            .toString();
-    }
-
     public static NodeResp build(Node node) {
         return NodeResp.builder()
                 .id(node.getId())
                 .nodeCode(node.getNodeCode())
+                .taskCode(node.getTaskCode())
                 .nodeName(node.getNodeName())
-                .nodeReq(node.getNodeReq())
-                .nodeResp(node.getNodeResp())
+                .nodeType(node.getNodeType())
+                .nodePositionTop(node.getNodePositionTop())
+                .nodePositionLeft(node.getNodePositionLeft())
                 .nodePreCode(node.getNodePreCode())
                 .nodeNextCode(node.getNodeNextCode())
                 .state(SysYesNo.getInfoByCode(node.getState()))
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java
index 85a936e..5f716c7 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/NodeController.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
+import com.muyu.common.core.enums.SysDBType;
 import com.muyu.quest.domain.TaskNodeMiddle;
 import com.muyu.quest.req.NodeReq;
 import com.muyu.quest.resp.NodeResp;
@@ -87,21 +88,21 @@ public class NodeController extends BaseController
      * 新增节点管理
      */
 //    @RequiresPermissions("quest:node:add")
-    @PostMapping("/{taskCode}")
+    @PostMapping
     @Transactional
     public Result<Integer> add(
-            @Validated @RequestBody Node node,@PathVariable("taskCode") String taskCode) {
+            @Validated @RequestBody Node node) {
         if (nodeService.checkIdUnique(node)) {
-            return error("新增 节点管理 '" + node + "'失败，节点管理已存在");
+            return error("新增 节点管理 '" + node + "'失败，节点已存在");
         }
         String code = UUID.randomUUID().toString().replace("-","");
         node.setNodeCode(code);
         node.setCreateBy(SecurityUtils.getUsername());
         boolean save = nodeService.save(node);
-        if (save){
-            // 新增任务节点中间表信息
-            middleService.save(new TaskNodeMiddle(null,taskCode,code));
-        }
+//        if (save){
+//            // 新增任务节点中间表信息
+//            middleService.save(new TaskNodeMiddle(null,taskCode,code));
+//        }
         return toAjax(save);
     }
 
@@ -111,10 +112,9 @@ public class NodeController extends BaseController
 //    @RequiresPermissions("quest:node:edit")
     @PutMapping
     public Result<Integer> edit(
-            @Validated @RequestBody Node node)
-    {
+            @Validated @RequestBody Node node){
         if (!nodeService.checkIdUnique(node)) {
-            return error("修改 节点管理 '" + node + "'失败，节点管理不存在");
+            return error("修改 节点管理 '" + node + "'失败，节点不存在");
         }
         node.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(nodeService.updateById(node));
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java
index 3b64727..efb7904 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java
@@ -78,7 +78,8 @@ public class TaskController extends BaseController
         if (taskService.checkTaskCodeUnique(task)) {
             return error("新增参数'" + task.getTaskName() + "'失败，任务已存在");
         }
-        task.setTaskCode(UUID.randomUUID().toString().replace("-",""));
+        String code = UUID.randomUUID().toString().replace("-", "");
+        task.setTaskCode(code);
         task.setCreateBy(SecurityUtils.getUsername());
         return toAjax(taskService.save(task));
     }
diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java
index fb87c7a..328df0e 100644
--- a/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java
+++ b/muyu-quest-server/src/main/java/com/muyu/quest/service/impl/NodeServiceImpl.java
@@ -49,6 +49,9 @@ public class NodeServiceImpl
     public List<Node> selectNodeList(NodeReq nodeReq)
     {
         LambdaQueryWrapper<Node> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(nodeReq.getTaskCode())){
+            queryWrapper.eq(Node::getTaskCode, nodeReq.getTaskCode());
+        }
         if (StringUtils.isNotEmpty(nodeReq.getNodeName())){
             queryWrapper.like(Node::getNodeName, nodeReq.getNodeName());
         }
diff --git a/muyu-quest-server/src/main/resources/mapper/quest/NodeMapper.xml b/muyu-quest-server/src/main/resources/mapper/quest/NodeMapper.xml
deleted file mode 100644
index c09aee7..0000000
--- a/muyu-quest-server/src/main/resources/mapper/quest/NodeMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.quest.mapper.NodeMapper">
-    
-    <resultMap type="Node" id="NodeResult">
-        <result property="id"    column="id"    />
-        <result property="nodeCode"    column="node_code"    />
-        <result property="nodeName"    column="node_name"    />
-        <result property="nodeReq"    column="node_req"    />
-        <result property="nodeResp"    column="node_resp"    />
-        <result property="nodePreCode"    column="node_pre_code"    />
-        <result property="nodeNextCode"    column="node_next_code"    />
-        <result property="state"    column="state"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectNodeVo">
-        select id, node_code, node_name, node_req, node_resp, node_pre_code, node_next_code, state, create_by, create_time, update_by, update_time, remark from node_source
-    </sql>
-
-    <select id="selectNodeList" parameterType="Node" resultMap="NodeResult">
-        <include refid="selectNodeVo"/>
-        <where>  
-            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
-            <if test="state != null  and state != ''"> and state = #{state}</if>
-        </where>
-    </select>
-    
-    <select id="selectNodeById" parameterType="Long" resultMap="NodeResult">
-        <include refid="selectNodeVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertNode" parameterType="Node" useGeneratedKeys="true" keyProperty="id">
-        insert into node_source
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="nodeCode != null and nodeCode != ''">node_code,</if>
-            <if test="nodeName != null">node_name,</if>
-            <if test="nodeReq != null">node_req,</if>
-            <if test="nodeResp != null">node_resp,</if>
-            <if test="nodePreCode != null">node_pre_code,</if>
-            <if test="nodeNextCode != null">node_next_code,</if>
-            <if test="state != null">state,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="nodeCode != null and nodeCode != ''">#{nodeCode},</if>
-            <if test="nodeName != null">#{nodeName},</if>
-            <if test="nodeReq != null">#{nodeReq},</if>
-            <if test="nodeResp != null">#{nodeResp},</if>
-            <if test="nodePreCode != null">#{nodePreCode},</if>
-            <if test="nodeNextCode != null">#{nodeNextCode},</if>
-            <if test="state != null">#{state},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateNode" parameterType="Node">
-        update node_source
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="nodeCode != null and nodeCode != ''">node_code = #{nodeCode},</if>
-            <if test="nodeName != null">node_name = #{nodeName},</if>
-            <if test="nodeReq != null">node_req = #{nodeReq},</if>
-            <if test="nodeResp != null">node_resp = #{nodeResp},</if>
-            <if test="nodePreCode != null">node_pre_code = #{nodePreCode},</if>
-            <if test="nodeNextCode != null">node_next_code = #{nodeNextCode},</if>
-            <if test="state != null">state = #{state},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteNodeById" parameterType="Long">
-        delete from node_source where id = #{id}
-    </delete>
-
-    <delete id="deleteNodeByIds" parameterType="String">
-        delete from node_source where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file