From c1f8f896d66fd3e59d7cf31a35dff852ecfa8743 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Tue, 6 May 2025 19:24:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dify):=20=E4=BC=98=E5=8C=96=20workflow?= =?UTF-8?q?=20=E8=BF=90=E8=A1=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B-=20=E5=B0=86=20DifyWorkflowService?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=20run=20=E6=96=B9=E6=B3=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=BB=8E=20WorkflowData=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20WorkflowRunResponse=20-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20DifyWorkflowServiceImpl=20=E4=B8=AD=E7=9A=84=20run?= =?UTF-8?q?=20=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0=20-=E8=B0=83=E6=95=B4?= =?UTF-8?q?=20V1WorkflowController=20=E4=B8=AD=E7=9A=84=20runWorkflow=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/dify/controller/V1WorkflowController.java | 4 ++-- .../dify/modules/dify/service/DifyWorkflowService.java | 4 +++- .../dify/service/Impl/DifyWorkflowServiceImpl.java | 8 +++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java index c26c6c6..688dba3 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java @@ -37,7 +37,7 @@ public class V1WorkflowController { */ @PostMapping("/run/{appId}") @PreAuthorize("hasAuthority('dify:workflow:run')") - public WorkflowData runWorkflow(@RequestBody WorkflowRunRequest request, @PathVariable String appId) { + public WorkflowRunResponse runWorkflow(@RequestBody WorkflowRunRequest request, @PathVariable String appId) { return difyWorkflowService.run(request, appId); } @@ -60,7 +60,7 @@ public class V1WorkflowController { * @return */ @PatchMapping("/stop/{appId}") - public WorkflowStopResponse stopWorkflowStream( String taskId, String userId, @PathVariable String appId) { + public WorkflowStopResponse stopWorkflowStream(String taskId, String userId, @PathVariable String appId) { String apiKey = appEntityRepository.selectApiKey(appId); return difyWorkflow.stopWorkflowStream(apiKey, taskId, userId); } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyWorkflowService.java b/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyWorkflowService.java index 118e99c..af33588 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyWorkflowService.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyWorkflowService.java @@ -3,7 +3,9 @@ package com.zsc.edu.dify.modules.dify.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zsc.edu.dify.modules.dify.entity.WorkflowData; import io.github.guoshiqiufeng.dify.workflow.dto.request.WorkflowRunRequest; +import io.github.guoshiqiufeng.dify.workflow.dto.response.WorkflowRunResponse; + public interface DifyWorkflowService extends IService { - WorkflowData run(WorkflowRunRequest request, String appId); + WorkflowRunResponse run(WorkflowRunRequest request, String appId); } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyWorkflowServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyWorkflowServiceImpl.java index d070834..e39ba73 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyWorkflowServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyWorkflowServiceImpl.java @@ -8,6 +8,7 @@ import com.zsc.edu.dify.modules.dify.repo.WorkflowRepository; import com.zsc.edu.dify.modules.dify.service.DifyWorkflowService; import io.github.guoshiqiufeng.dify.workflow.DifyWorkflow; import io.github.guoshiqiufeng.dify.workflow.dto.request.WorkflowRunRequest; +import io.github.guoshiqiufeng.dify.workflow.dto.response.WorkflowRunResponse; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -23,12 +24,13 @@ public class DifyWorkflowServiceImpl extends ServiceImpl