[工作流模块] 新增了可发起流程接口

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

@@ -3,11 +3,8 @@ 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.VariableStorage;
-import com.tykj.workflowcore.workflow_editer.entity.vo.SearchFlowInfoVo;
-import com.tykj.workflowcore.workflow_editer.entity.vo.SearchVariableStorageVo;
-import com.tykj.workflowcore.workflow_editer.entity.vo.VariableStorageVo;
+import com.tykj.workflowcore.workflow_editer.entity.vo.*;
 import com.tykj.workflowcore.workflow_editer.service.*;
-import com.tykj.workflowcore.workflow_editer.entity.vo.FlowsInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -46,11 +43,18 @@ public class FlowsInfoController {
     private VariableStorageService variableStorageService;
 
 
+    @PostMapping("/searchAllFlowInfo")
+    @ApiOperation(value = "查询所有流程信息")
+    public Page<FlowsInfo> searchAllFlowInfo(@RequestBody SearchAllFlowInfoVo searchAllFlowInfoVo){
+
+        return flowInfoService.searchAllFlowInfo(searchAllFlowInfoVo);
+    }
+
     @PostMapping("/searchFlowInfo")
-    @ApiOperation(value = "查询流程信息")
-    public ResponseEntity searchFlowInfo(@RequestBody SearchFlowInfoVo searchFlowInfoVo){
-        Page<FlowsInfo> flowsInfoList = flowInfoService.searchFlowInfo(searchFlowInfoVo);
-        return ResultUtil.success(flowsInfoList,"查询成功");
+    @ApiOperation(value = "查询可发起流程信息")
+    public Page<FlowsInfo> searchFlowInfo(@RequestBody SearchFlowInfoVo searchFlowInfoVo){
+
+        return flowInfoService.searchFlowInfo(searchFlowInfoVo);
     }
 
     @PostMapping("/upLoadFile")

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

@@ -33,9 +33,9 @@ public class WorkFlowController {
 
     @PostMapping("/startFlow")
     @ApiOperation("开启流程")
-    public String startFlow(@RequestBody StartFlowVo startFlowVo){
+    public ResponseEntity startFlow(@RequestBody StartFlowVo startFlowVo){
         workFlowService.startFlow(startFlowVo);
-        return null;
+        return ResultUtil.success("流程开启成功");
     }
 
     @PostMapping("/findUserTask")

src/main/java/com/tykj/workflowcore/workflow_editer/dao/FlowsInfoMapper.java

@@ -33,4 +33,5 @@ public interface FlowsInfoMapper extends JpaRepository<FlowsInfo,Integer>, JpaSp
      * @return
      */
     FlowsInfo findByProcessInstanceId(String processInstanceId);
+
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/FlowsInfo.java

@@ -62,7 +62,7 @@ public class FlowsInfo extends BaseEntity {
     private String startId;
 
     @ApiModelProperty("开始节点的id")
-    private String startPageId;
+    private Integer startPageId;
 
     @ApiModelProperty("流程实例id")
     private String processInstanceId;

src/main/java/com/tykj/workflowcore/workflow_editer/entity/FormPage.java

@@ -54,6 +54,7 @@ public class FormPage extends BaseEntity {
     private String css;
 
     @ApiModelProperty("json描述文件")
+    @Lob
     private String descFile;
 
     @ApiModelProperty("实体类id")

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

@@ -39,23 +39,23 @@ public class NodeInfo extends BaseEntity {
     @ApiModelProperty("流程名")
     private String flowName;
 
-    @ApiModelProperty("候选人类型")
-    private String candidateType;
-
-    @ApiModelProperty("候选人显示值")
-    private String candidateLabel;
-
-    @ApiModelProperty("候选人显示值")
-    private String candidateValue;
-
-    @ApiModelProperty("0为默认,1为可视,2为公式")
-    private Integer expressionType;
-
-    @ApiModelProperty("输入框中的值  例如： 同意，不同意")
-    private Integer expressionValue;
-
-    @ApiModelProperty("连接条件")
-    private String expressionConnectionConditions;
+//    @ApiModelProperty("候选人类型")
+//    private String candidateType;
+//
+//    @ApiModelProperty("候选人显示值")
+//    private String candidateLabel;
+//
+//    @ApiModelProperty("候选人显示值")
+//    private String candidateValue;
+//
+//    @ApiModelProperty("0为默认,1为可视,2为公式")
+//    private Integer expressionType;
+//
+//    @ApiModelProperty("输入框中的值  例如： 同意，不同意")
+//    private Integer expressionValue;
+//
+//    @ApiModelProperty("连接条件")
+//    private String expressionConnectionConditions;
 
     @ApiModelProperty("判断条件拼接字段  例如：[{'resource':'${people.id}','comparator':'>=','value':'10'}]")
     private String expressionCondition;

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

@@ -52,6 +52,7 @@ public class FormPageVo {
     private Date updateTime;
 
     @ApiModelProperty("json描述文件")
+    @Lob
     private String descFile;
 
     @ApiModelProperty("实体类")

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

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 public class SearchFlowInfoVo extends JpaCustomPage {
 
     @ApiModelProperty(value = "状态",notes = "0 可用，1 暂停")
-    private Integer state;
+    private Integer state = 0;
 
     @ApiModelProperty("流程名称")
     private String flowName;

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

@@ -39,6 +39,6 @@ public class TaskVo {
 
     private Map<String,Object> map;
 
-    @ApiModelProperty("条件表达式")
-    private String conditionalExpression;
+//    @ApiModelProperty("条件表达式")
+//    private String conditionalExpression;
 }

src/main/java/com/tykj/workflowcore/workflow_editer/enums/TypeEnums.java

-package com.tykj.workflowcore.workflow_editer.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-
-/**
- * ClassName:    TypeEnums
- * Package:    com.tykj
- * Description:
- * Datetime:    2021/3/2   19:46
- *
- * @Author: zsp
- */
-@AllArgsConstructor
-@NoArgsConstructor
-public enum TypeEnums {
-
-    AGREE("同意",0),
-    REFUSE("拒绝",1),
-    TRANSFER("转交",2);
-
-    private String name;
-
-    private int index;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-}

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

 package com.tykj.workflowcore.workflow_editer.service;
 
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.entity.vo.SearchAllFlowInfoVo;
 import com.tykj.workflowcore.workflow_editer.entity.vo.SearchFlowInfoVo;
 import com.tykj.workflowcore.workflow_editer.entity.vo.FlowsInfoVo;
 import org.springframework.data.domain.Page;
@@ -58,6 +59,13 @@ public interface FlowInfoService {
      */
     FlowsInfo disableFlow(Integer flowInfoId);
 
+    /**
+     * 有条件的查询flowInfo
+     * @param searchAllFlowInfoVo
+     * @return
+     */
+    Page<FlowsInfo> searchAllFlowInfo(SearchAllFlowInfoVo searchAllFlowInfoVo);
+
     /**
      * 有条件的查询flowInfo
      * @param searchFlowInfoVo

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

@@ -4,6 +4,7 @@ import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.workflowcore.base.result.ApiException;
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
+import com.tykj.workflowcore.workflow_editer.entity.vo.SearchAllFlowInfoVo;
 import com.tykj.workflowcore.workflow_editer.entity.vo.SearchFlowInfoVo;
 import com.tykj.workflowcore.workflow_editer.dao.FlowsInfoMapper;
 import com.tykj.workflowcore.workflow_editer.service.FlowInfoService;
@@ -80,6 +81,15 @@ public class FlowInfoServiceImpl implements FlowInfoService {
         return null;
     }
 
+    @Override
+    public Page<FlowsInfo> searchAllFlowInfo(SearchAllFlowInfoVo searchAllFlowInfoVo) {
+        PredicateBuilder<FlowsInfo> and = Specifications.and();
+        and.eq(searchAllFlowInfoVo.getState()!=null,"state",searchAllFlowInfoVo.getState());
+        and.eq(searchAllFlowInfoVo.getFlowKey()!=null,"flowKey",searchAllFlowInfoVo.getFlowKey());
+        and.like(searchAllFlowInfoVo.getFlowName()!=null,"flowName","%"+searchAllFlowInfoVo.getFlowName()+"%");
+        return flowsInfoMapper.findAll(and.build(), searchAllFlowInfoVo.getPageable());
+    }
+
     @Override
     public Page<FlowsInfo> searchFlowInfo(SearchFlowInfoVo searchFlowInfoVo) {
         PredicateBuilder<FlowsInfo> and = Specifications.and();

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

@@ -161,8 +161,15 @@ public class WorkFlowServiceImpl implements WorkFlowService {
             throw new ApiException(null,message.toString());
 
         }else {
-            //自动部署
-            deployXml(save);
+            //通过id状态
+            Integer state = save.getState();
+            if(state == 1){
+                return;
+            }else {
+                //自动部署
+                deployXml(save);
+            }
+
         }
 
     }
@@ -200,11 +207,14 @@ public class WorkFlowServiceImpl implements WorkFlowService {
         Authentication.setAuthenticatedUserId(currentUser.getId() + "");
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(startFlowVo.getFlowKey(),
                 startFlowVo.getMap());
-        //存储流程实例id
-        //根据flowKey查询出一个FlowInfo
+//        存储流程实例id
+//        根据flowKey查询出一个FlowInfo
 //        FlowsInfo flowsInfo = flowsInfoMapper.findByFlowKey(startFlowVo.getFlowKey());
+        //开始页面的id
+//        Integer startPageId = flowsInfo.getStartPageId();
 //        flowsInfo.setProcessInstanceId(processInstance.getProcessInstanceId());
 //        flowsInfoMapper.save(flowsInfo);
+//        return startPageId;
     }
 
 
@@ -233,7 +243,8 @@ public class WorkFlowServiceImpl implements WorkFlowService {
             //节点id
             String taskDefinitionKey = task.getTaskDefinitionKey();
             //通过节点id查询出pageId
-            Integer currentPageId = nodeInfoService.findByNodeId(taskDefinitionKey);
+//            Integer currentPageId = nodeInfoService.findByNodeId(taskDefinitionKey);
+            String formKey = task.getFormKey();
             map.put("taskId", task.getId());
             map.put("processKey", processInstance.getProcessDefinitionKey());
             map.put("taskName", task.getName());
@@ -241,7 +252,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
             map.put("createTime", task.getCreateTime());
             map.put("promoter", processInstance.getStartUserId());
             map.put("processInstanceId", processInstance.getId());
-            map.put("currentPageId", currentPageId);
+            map.put("currentPageId", formKey);
             listMap.add(map);
         }
         return listMap;
@@ -336,6 +347,7 @@ public class WorkFlowServiceImpl implements WorkFlowService {
                 repositoryService.activateProcessDefinitionByKey(flowKey, true, new Date());
                 flowsInfo.setState(0);
             }
+
         } else {
             throw new ApiException("该流程未编辑流程图无法被启用");
         }

src/main/java/com/tykj/workflowcore/workflow_editer/validate/UserTaskValidator.java

@@ -16,7 +16,6 @@ import java.util.List;
  *
  * @Author: zsp
  */
-//在部署流程之前需要校验流程中的所有用户任务是否指定办理人
 public class UserTaskValidator extends ProcessLevelValidator {
 
     @Override

src/main/resources/application.yml

 spring:
   datasource:
     username: root
-    password: 123456
-    url: jdbc:mysql://localhost:3306/mydata?useSSL=false&serverTimezone=UTC&characterEncoding=utf-8&nullCatalogMeansCurrent=true
+    password: Huang123+
+    url: jdbc:mysql://47.106.142.73:3306/www?useSSL=false&serverTimezone=GMT%2b8&characterEncoding=utf-8&nullCatalogMeansCurrent=true
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true
     hibernate:
       ddl-auto: update
+  jackson:
+    time-zone: GMT+8
 server:
   port: 8800