hubin 1 год назад
Родитель
Сommit
47de421731

+ 2 - 3
src/main/java/com/aizuda/boot/modules/flw/controller/ProcessController.java

@@ -1,11 +1,10 @@
 package com.aizuda.boot.modules.flw.controller;
 
-import com.aizuda.boot.modules.flw.flow.FlowHelper;
 import com.aizuda.boot.modules.flw.entity.dto.FlwProcessDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessStartDTO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessCategoryVO;
+import com.aizuda.boot.modules.flw.flow.FlowHelper;
 import com.aizuda.boot.modules.flw.service.IFlwProcessService;
-import com.aizuda.bpm.engine.model.NodeModel;
 import com.aizuda.core.api.ApiController;
 import com.baomidou.kisso.annotation.Permission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -64,7 +63,7 @@ public class ProcessController extends ApiController {
     })
     @Permission("sys:process:get")
     @PostMapping("/node-model")
-    public NodeModel nodeModel(@RequestParam Long id) {
+    public String nodeModel(@RequestParam Long id) {
         return flwProcessService.getNodeModelById(id);
     }
 

+ 2 - 3
src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessService.java

@@ -3,10 +3,9 @@ package com.aizuda.boot.modules.flw.service;
 import com.aizuda.boot.modules.flw.entity.dto.FlwProcessDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessStartDTO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessCategoryVO;
-import com.aizuda.bpm.engine.model.NodeModel;
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.bpm.engine.core.FlowCreator;
 import com.aizuda.bpm.engine.entity.FlwProcess;
+import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -46,7 +45,7 @@ public interface IFlwProcessService extends IBaseService<FlwProcess> {
      *
      * @param id 流程定义ID
      */
-    NodeModel getNodeModelById(Long id);
+    String getNodeModelById(Long id);
 
     List<Map<String, Object>> listNodeMapById(Long id);
 

+ 5 - 6
src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java

@@ -9,12 +9,8 @@ import com.aizuda.boot.modules.flw.entity.dto.FlwProcessPermissionDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessStartDTO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessCategoryVO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO;
-import com.aizuda.boot.modules.flw.flow.FlowForm;
 import com.aizuda.boot.modules.flw.mapper.FlowlongMapper;
 import com.aizuda.boot.modules.flw.service.*;
-import com.aizuda.core.api.ApiAssert;
-import com.aizuda.service.web.UserSession;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.aizuda.bpm.engine.FlowDataTransfer;
 import com.aizuda.bpm.engine.FlowLongEngine;
 import com.aizuda.bpm.engine.core.FlowCreator;
@@ -23,6 +19,9 @@ import com.aizuda.bpm.engine.entity.FlwInstance;
 import com.aizuda.bpm.engine.entity.FlwProcess;
 import com.aizuda.bpm.engine.model.*;
 import com.aizuda.bpm.mybatisplus.mapper.FlwProcessMapper;
+import com.aizuda.core.api.ApiAssert;
+import com.aizuda.service.web.UserSession;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -136,9 +135,9 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
     }
 
     @Override
-    public NodeModel getNodeModelById(Long id) {
+    public String getNodeModelById(Long id) {
         FlwProcess flwProcess = this.checkById(id);
-        return flwProcess.model().getNodeConfig();
+        return flwProcess.getModelContent();
     }
 
     @Override