工作流跑通

jyzb-process/pom.xml

@@ -223,7 +223,13 @@
             <version>1.1.4c</version>
             <scope>compile</scope>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>3.0.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--        <dependency>-->
 <!--            <groupId>io.springfox</groupId>-->
 <!--            <artifactId>springfox-swagger-ui</artifactId>-->
 <!--            <version>2.9.2</version>-->

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -4,21 +4,17 @@ package com.junmp.junmpProcess.common;
  *
  */
 public interface CommonConstants {
-    /**
-     * {@code 500 Server Error} (HTTP/1.0 - RFC 1945)
-     */
+    /** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
     Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
-    /**
-     * {@code 200 OK} (HTTP/1.0 - RFC 1945)
-     */
+    /** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
     Integer SC_OK_200 = 200;
 
-    String FORM_VAR = "formData";
-    String PROCESS_STATUS = "processStatus";
-    String START_USER_INFO = "startUser";
-    String BUSINESS_STATUS_1 = "1"; //正在处理
-    String BUSINESS_STATUS_2 = "2";//撤销
-    String BUSINESS_STATUS_3 = "3";//驳回
-    String BUSINESS_STATUS_4 = "4";//已结束
+    String FORM_VAR="formData";
+    String PROCESS_STATUS="processStatus";
+    String START_USER_INFO="startUser";
+    String BUSINESS_STATUS_1="1"; //正在处理
+    String BUSINESS_STATUS_2="2";//撤销
+    String BUSINESS_STATUS_3="3";//驳回
+    String BUSINESS_STATUS_4="4";//已结束
 
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/config/ActivitiConfig.java

@@ -44,7 +44,7 @@ public class ActivitiConfig {
         config.setTransactionManager(transactionManager);
         config.setDisableIdmEngine(true);
         config.setDatabaseType(ProcessEngineConfigurationImpl.DATABASE_TYPE_MYSQL);
-        config.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE);
+        config.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_FALSE);
         config.setDelegateExpressionFieldInjectionMode(DelegateExpressionFieldInjectionMode.MIXED);
         config.setIdGenerator(idWorkerIdGenerator);
         config.setAsyncExecutorActivate(Boolean.TRUE);
@@ -60,9 +60,9 @@ public class ActivitiConfig {
         config.setHttpClientConfig(httpClientConfig);
         config.setKnowledgeBaseCacheLimit(200);
         config.setProcessDefinitionCacheLimit(200);
-        List<JobHandler> customJobHandlers = new ArrayList<>();
-        customJobHandlers.add(new CustomJobHandler());
-        config.setCustomJobHandlers(customJobHandlers);
+//        List<JobHandler> customJobHandlers = new ArrayList<>();
+//        customJobHandlers.add(new CustomJobHandler());
+//        config.setCustomJobHandlers(customJobHandlers);
         return config;
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

 package com.junmp.junmpProcess.dto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.junmp.junmpProcess.dto.json.JunmpUserInfo;
 import lombok.Data;
 import com.junmp.junmpProcess.dto.json.UserInfo;
 
@@ -14,7 +15,8 @@ import java.util.Map;
 @Data
 public class StartProcessInstanceDTO {
     private String processDefinitionId;
+    private String processId;
     private JSONObject formData;
-    private Map<String, List<UserInfo>> processUsers;
-    private UserInfo startUserInfo;
+    private Map<String, List<JunmpUserInfo>> processUsers;
+    private JunmpUserInfo startUserInfo;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/TaskDTO.java

 package com.junmp.junmpProcess.dto;
 
+import com.junmp.junmpProcess.dto.json.JunmpUserInfo;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import com.junmp.junmpProcess.dto.json.UserInfo;
@@ -11,5 +12,5 @@ import com.junmp.junmpProcess.dto.json.UserInfo;
 @Data
 @ApiModel("待办 需要返回给前端的VO")
 public class TaskDTO extends PageDTO {
-    private UserInfo currentUserInfo;
+    private JunmpUserInfo currentUserInfo;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/JunmpUserInfo.java

+package com.junmp.junmpProcess.dto.json;
+
+import lombok.Data;
+
+@Data
+public class JunmpUserInfo {
+    private String userId;
+    private String sex;
+    private String name;
+}

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java

@@ -44,11 +44,11 @@ public class ProcessTemplates implements Serializable {
     /**
      * 摸板表单
      */
-    private String formItems;
+    private String formJson;
 
     private String settings;
 
-    private String process;
+    private String processJson;
     /**
      * 图标
      */

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/ProcessTemplateService.java

 package com.junmp.junmpProcess.service.Repository;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
+import org.flowable.bpmn.model.BpmnModel;
 
 /**
  * @author : willian fu
@@ -9,5 +11,10 @@ import com.junmp.junmpProcess.entity.ProcessTemplates;
  */
 public interface ProcessTemplateService extends IService<ProcessTemplates> {
 
-
+    /**
+     * 获取用户可见表单
+     *
+     * @return
+     */
+    public BpmnModel toBpmn(JsonNode processNode, JsonNode formNode,String formName);
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/BpmnConvert.java

 package com.junmp.junmpProcess.utils;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.junmp.junmpProcess.dto.json.flowJson.Inout;
+import com.junmp.junmpProcess.entity.ProcessTemplates;
 import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 public class BpmnConvert {
 
     public BpmnModel toBpmn(JsonNode node,JsonNode formNode) {
+        //表单存储
+//        String remark = flowEngineDTO.getRemark();
+//        String formItems = flowEngineDTO.getFormItems();
+//        String formName = flowEngineDTO.getFormName();
+//        String logo = flowEngineDTO.getLogo();
+//        Integer groupId = flowEngineDTO.getGroupId();
+//        String templateId = idWorker.nextId()+"";
+//        ProcessTemplates processTemplates = ProcessTemplates.builder().build();
+//        processTemplates.setTemplateId(templateId);
+//        processTemplates.setTemplateName(formName);
+//        processTemplates.setGroupId(groupId);
+//        processTemplates.setFormItems(formItems);
+//        processTemplates.setProcess(processJson);
+//        processTemplates.setIcon(logo);
+//        processTemplates.setBackground(logo);
+//        processTemplates.setNotify(settingsInfo.getNotify().toJSONString());
+//        String adminInfo = JSONObject.toJSONString(settingsInfo.getAdmin());
+//        processTemplates.setSettings(settingsJson);
+//        processTemplates.setWhoCommit(adminInfo);
+//        processTemplates.setWhoEdit(adminInfo);
+//        processTemplates.setWhoExport(adminInfo);
+//        processTemplates.setRemark(flowEngineDTO.getRemark());
+//        processTemplates.setIsStop(false);
+//        Date date= new Date();
+//        processTemplates.setCreated(date);
+//        processTemplates.setUpdated(date);
+//        processTemplateService.save(processTemplates);
         // 一.准备工作
         BpmnModel bpmnModel = new BpmnModel();
         String id=""+UUID.randomUUID();
@@ -110,10 +140,15 @@ public class BpmnConvert {
 
     private List<FormProperty> formJsonToFormProperty(JsonNode formJson){
         List<FormProperty> formList=new ArrayList<>();
-        FormProperty form=new FormProperty();
 
 
-        return  null;
+        for (JsonNode listInfo : formJson.get("list")) {
+            FormProperty form=new FormProperty();
+            form.setName(listInfo.get("key").toString());
+            formList.add(form);
+        }
+
+        return  formList;
     }
 
 
@@ -233,7 +268,7 @@ public class BpmnConvert {
      */
     public SequenceFlow createSequenceFlow(String from, String to, String conditionExpression) {
         SequenceFlow flow = new SequenceFlow();
-        flow.setId(from + "-" + to);
+        flow.setId("Node_"+UUID.randomUUID());
         flow.setSourceRef(from);
         flow.setTargetRef(to);
         if (conditionExpression != null) {

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/JsonToELConverter.java

@@ -32,7 +32,7 @@ public class JsonToELConverter {
                     expressionBuilder.append(" ");
                 }
 
-                expressionBuilder.append("(");
+//                expressionBuilder.append("(");
 
                 for (int j = 0; j < conditions.length; j++) {
                     JsonNode conditionObject = conditions[j];
@@ -58,13 +58,13 @@ public class JsonToELConverter {
                         expressionBuilder.append(columnValue);
                         expressionBuilder.append(" ");
                         expressionBuilder.append(optType);
-                        expressionBuilder.append(" '");
+                        expressionBuilder.append(" ");
                         expressionBuilder.append(conditionValues[0].asText());
-                        expressionBuilder.append("'}");
+                        expressionBuilder.append("}");
                     }
                 }
 
-                expressionBuilder.append(")");
+//                expressionBuilder.append(")");
             }
         }
     }