增加节点信息类的字段

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FlowsInfoController.java

@@ -2,9 +2,10 @@ package com.tykj.workflowcore.workflow_editer.controller;
 
 import com.tykj.workflowcore.base.result.ResultUtil;
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
-import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
 import com.tykj.workflowcore.workflow_editer.entity.VariableStorage;
 import com.tykj.workflowcore.workflow_editer.entity.WorkFlowUser;
+import com.tykj.workflowcore.workflow_editer.entity.vo.NodeInfoVo;
 import com.tykj.workflowcore.workflow_editer.entity.vo.VariableStorageVo;
 import com.tykj.workflowcore.workflow_editer.service.*;
 import com.tykj.workflowcore.workflow_editer.vo.DeployedVo;
@@ -18,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -46,9 +46,6 @@ public class FlowsInfoController {
     @Autowired
     private NodePageService nodePageService;
 
-    @Autowired
-    private UserService userService;
-
     @Autowired
     private VariableStorageService variableStorageService;
 
@@ -94,15 +91,19 @@ public class FlowsInfoController {
         return ResultUtil.success(flowsInfo.getState(),"流程部署成功");
     }
 
-    @PostMapping("/saveXml02")
-    @ApiOperation(value = "保存xml02")
-    public ResponseEntity saveXml02(@RequestBody FlowsInfoVo flowsInfoVo) {
-        List<NodePage> nodePages = flowsInfoVo.getNodePages();
-        nodePageService.saveNodePages(nodePages);
+    @PostMapping("/saveXml")
+    @ApiOperation(value = "保存xml以及其他流程信息")
+    public ResponseEntity saveXml(@RequestBody FlowsInfoVo flowsInfoVo) {
+        //保存节点信息
+        nodePageService.saveNodeInfoList(flowsInfoVo.getNodeInfoList());
+        //保存xml信息
         workFlowService.flowXml(flowsInfoVo);
         return ResultUtil.success("文件保存成功");
     }
 
+    //保存流程中的 节点信息和节点内容
+
+
     @PostMapping("/updateByProcessName")
     @ApiOperation(value = "通过流程名称修改")
     public ResponseEntity updateByProcessName(@RequestBody FlowsInfoVo flowsInfoVo) {
@@ -130,10 +131,5 @@ public class FlowsInfoController {
         VariableStorage variableStorage = variableStorageService.saveVariableStorageService(variableStorageVo.toEntity());
         return ResultUtil.success(variableStorage,"调用接口成功");
     }
-    
-    @PostMapping("/test")
-    public WorkFlowUser test(){
-        return userService.getCurrentUser();
-    }
 
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/NodePage.java → src/main/java/com/tykj/workflowcore/workflow_editer/entity/NodeInfo.java

@@ -25,8 +25,8 @@ import javax.persistence.Id;
 @NoArgsConstructor
 @Entity
 @WorkFlowCoreNoScan
-@Api("节点所在页面")
-public class NodePage {
+@Api("节点信息")
+public class NodeInfo {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -39,8 +39,22 @@ public class NodePage {
     @ApiModelProperty("页面id")
     private long pageId;
 
+    @ApiModelProperty("流程key")
     private String flowKey;
 
+    @ApiModelProperty("流程名")
     private String flowName;
 
+    @ApiModelProperty("0为默认,1为可视,2为公式")
+    private Integer type;
+
+    @ApiModelProperty("输入框中的值  例如： 同意，不同意")
+    private Integer value;
+
+    @ApiModelProperty("连接条件")
+    private String connectionConditions;
+
+    @ApiModelProperty("判断条件拼接字段  例如：[{'resource':'${people.id}','comparator':'>=','value':'10'}]")
+    private String expressionCondition;
+
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/vo/NodeInfoVo.java

+package com.tykj.workflowcore.workflow_editer.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author HuangXiahao
+ * @version V1.0
+ * @class NodeInfoVo
+ * @packageName com.tykj.workflowcore.workflow_editer.entity.vo
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class NodeInfoVo {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("节点id")
+    private String nodeId;
+
+    @ApiModelProperty("页面id")
+    private long pageId;
+
+    @ApiModelProperty("流程key")
+    private String flowKey;
+
+    @ApiModelProperty("流程名")
+    private String flowName;
+
+    @ApiModelProperty("0为默认,1为可视,2为公式")
+    private Integer type;
+
+    @ApiModelProperty("输入框中的值  例如： 同意，不同意")
+    private Integer value;
+
+    @ApiModelProperty("连接条件")
+    private String connectionConditions;
+
+    @ApiModelProperty("判断条件拼接字段  例如：[{'resource':'${people.id}','comparator':'>=','value':'10'}]")
+    private String expressionCondition;
+
+
+}

src/main/java/com/tykj/workflowcore/workflow_editer/mapper/NodePageMapper.java

 package com.tykj.workflowcore.workflow_editer.mapper;
 
-import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
@@ -12,7 +12,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  *
  * @Author: zsp
  */
-public interface NodePageMapper extends JpaRepository<NodePage,Long>, JpaSpecificationExecutor<NodePage> {
+public interface NodePageMapper extends JpaRepository<NodeInfo,Long>, JpaSpecificationExecutor<NodeInfo> {
 
     /**
      * 通过节点id得到pageId

src/main/java/com/tykj/workflowcore/workflow_editer/service/NodePageService.java

 package com.tykj.workflowcore.workflow_editer.service;
 
-import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
 
 import java.util.List;
 
@@ -22,13 +22,14 @@ public interface NodePageService {
 
     /**
      * 保存节点和页面的关系
-     * @param nodePage
+     * @param nodeInfo
      */
-    void saveNodePage(NodePage nodePage);
+    void saveNodePage(NodeInfo nodeInfo);
 
     /**
-     * @param nodePages 集合
+     * 保存nodeInfo集合 至数据库中
+     * @param nodeInfoList 集合
      */
-    void saveNodePages(List<NodePage> nodePages);
+    void saveNodeInfoList(List<NodeInfo> nodeInfoList);
 
 }

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/NodePageServiceImpl.java

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
-import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
 import com.tykj.workflowcore.workflow_editer.mapper.NodePageMapper;
 import com.tykj.workflowcore.workflow_editer.service.NodePageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +27,13 @@ public class NodePageServiceImpl implements NodePageService {
     }
 
     @Override
-    public void saveNodePage(NodePage nodePage) {
+    public void saveNodePage(NodeInfo nodeInfo) {
 
-       nodePageMapper.save(nodePage);
+       nodePageMapper.save(nodeInfo);
     }
 
     @Override
-    public void saveNodePages(List<NodePage> nodePages) {
-        nodePageMapper.saveAll(nodePages);
+    public void saveNodeInfoList(List<NodeInfo> nodeInfos) {
+        nodePageMapper.saveAll(nodeInfos);
     }
 }

src/main/java/com/tykj/workflowcore/workflow_editer/vo/FlowsInfoVo.java

 package com.tykj.workflowcore.workflow_editer.vo;
 
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
-import com.tykj.workflowcore.workflow_editer.entity.NodePage;
+import com.tykj.workflowcore.workflow_editer.entity.NodeInfo;
+import com.tykj.workflowcore.workflow_editer.entity.vo.NodeInfoVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -54,7 +55,7 @@ public class FlowsInfoVo {
     private String startId;
 
     @ApiModelProperty()
-    private List<NodePage> nodePages;
+    private List<NodeInfo> nodeInfoList;
 
     public FlowsInfo toEntity(){
         FlowsInfo flowsInfo = new FlowsInfo();