修改解析参数值传递问题

byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java

@@ -38,7 +38,7 @@ public class ApiFlowController {
         return ResponseResult.ok("SUCCESS");
     }
 
-    @PostMapping("delete")
+    @PostMapping("deleteFlow")
     @ApiOperation("删除工作流,若当前工作流被依赖则删除失败，只允许删除不被依赖的工作流，当前工作流依赖其他工作流不影响")
     public ResponseResult deleteFlow(String param){
         apiFlowService.deleteFlow(param);

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

@@ -2,6 +2,7 @@ package com.byit.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.byit.dto.api.DeleteDto;
 import com.byit.dto.plugin.*;
 import com.byit.enums.DagCheckEnum;
 import com.byit.enums.FlowPropertyEnum;
@@ -12,9 +13,9 @@ import com.byit.job.utils.CronExpression;
 import com.byit.job.utils.CurrentUserUtils;
 import com.byit.job.utils.PlaceholderUtils;
 import com.byit.mapper.*;
-import com.byit.model.*;
 import com.byit.model.JobTaskRunLog;
 import com.byit.model.RunRecording;
+import com.byit.model.*;
 import com.byit.model.vo.RunRecordingVo;
 import com.byit.service.ApiFlowService;
 import com.byit.util.ApiFlowDagCheck;
@@ -82,15 +83,18 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Resource
     private CurrentUserUtils currentUserUtils;
 
-    private void parseParam(String param, String workspaceName, String flowName){
+    private void parseParam(String param, DeleteDto deletDto){
         ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
         JSONObject jsonObject = JSON.parseObject(param);
         //获取工作空间名称
-        workspaceName = jsonObject.getString("workspaceName");
+        String workspaceName = jsonObject.getString("workspaceName");
         ValidationUtil.dataNotBank(workspaceName, "工作空间名称不允许为空！");
         //获取工作流名称
-        flowName = jsonObject.getString("flowName");
+        String flowName = jsonObject.getString("flowName");
         ValidationUtil.dataNotBank(flowName, "工作流名称不允许为空！");
+
+        deletDto.setFlowName(flowName);
+        deletDto.setWorkspaceName(workspaceName);
     }
 
     @Override
@@ -894,9 +898,11 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteFlow(String param) {
-        String workspaceName = "";
-        String flowName = "";
-        parseParam(param, workspaceName, flowName);
+
+        DeleteDto deleteDto = new DeleteDto();
+        parseParam(param,deleteDto);
+        String workspaceName = deleteDto.getWorkspaceName();
+        String flowName = deleteDto.getFlowName();
         log.info("删除工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -941,9 +947,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void start(String param) throws ParseException {
-        String workspaceName = "";
-        String flowName = "";
-        parseParam(param, workspaceName, flowName);
+        DeleteDto deleteDto = new DeleteDto();
+        parseParam(param,deleteDto);
+        String workspaceName = deleteDto.getWorkspaceName();
+        String flowName = deleteDto.getFlowName();
         log.info("开始工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -958,9 +965,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void repealSchedule(String param) throws ParseException {
-        String workspaceName = "";
-        String flowName = "";
-        parseParam(param, workspaceName, flowName);
+        DeleteDto deleteDto = new DeleteDto();
+        parseParam(param,deleteDto);
+        String workspaceName = deleteDto.getWorkspaceName();
+        String flowName = deleteDto.getFlowName();
         log.info("撤销工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -1016,9 +1024,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String stopSchedule(String param) {
-        String workspaceName = "";
-        String flowName = "";
-        parseParam(param, workspaceName, flowName);
+        DeleteDto deleteDto = new DeleteDto();
+        parseParam(param,deleteDto);
+        String workspaceName = deleteDto.getWorkspaceName();
+        String flowName = deleteDto.getFlowName();
         log.info("停止工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/api/DeleteDto.java

+package com.byit.dto.api;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author huangfu
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeleteDto {
+    private String flowName;
+    private String workspaceName;
+}