重构参数接受方式

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

@@ -35,49 +35,34 @@ public class ApiFlowController {
     @PostMapping("delete")
     @ApiOperation("删除工作流,若当前工作流被依赖则删除失败，只允许删除不被依赖的工作流，当前工作流依赖其他工作流不影响")
     public String deleteFlow(String param){
-        JSONObject jsonObject = JSON.parseObject(param);
-        String flowName = jsonObject.getString("flowName");
-        String workspaceName = jsonObject.getString("workspaceName");
-        apiFlowService.deleteFlow(flowName, workspaceName);
+        apiFlowService.deleteFlow(param);
         return "SUCCESS";
     }
 
     @PostMapping("start")
     @ApiOperation("开始工作流的调度，将工作流启用调度")
     public String start(String param) throws ParseException {
-        JSONObject jsonObject = JSON.parseObject(param);
-        String flowName = jsonObject.getString("flowName");
-        String workspaceName = jsonObject.getString("workspaceName");
-        apiFlowService.start(flowName, workspaceName);
+        apiFlowService.start(param);
         return "SUCCESS";
     }
 
     @PostMapping("repealSchedule")
     @ApiOperation("撤销工作流调度，只可以撤销总工作流，若为内嵌工作流不允许撤销")
     public String repealSchedule(String param) throws ParseException {
-        JSONObject jsonObject = JSON.parseObject(param);
-        String flowName = jsonObject.getString("flowName");
-        String workspaceName = jsonObject.getString("workspaceName");
-        apiFlowService.repealSchedule(flowName, workspaceName);
+        apiFlowService.repealSchedule(param);
         return "SUCCESS";
     }
     @PostMapping("killSchedule")
     @ApiOperation("杀死本次调度")
     public String killSchedule(String param){
-        JSONObject jsonObject = JSON.parseObject(param);
-        String flowName = jsonObject.getString("flowName");
-        String workspaceName = jsonObject.getString("workspaceName");
-        apiFlowService.killSchedule(flowName, workspaceName);
+        apiFlowService.killSchedule(param);
         return "SUCCESS";
     }
 
     @PostMapping("stopSchedule")
     @ApiOperation("暂停本次调度")
     public String stopSchedule(String param){
-        JSONObject jsonObject = JSON.parseObject(param);
-        String flowName = jsonObject.getString("flowName");
-        String workspaceName = jsonObject.getString("workspaceName");
-        return apiFlowService.stopSchedule(flowName, workspaceName);
+        return apiFlowService.stopSchedule(param);
     }
 
     @PostMapping("reStartSchedule")

byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java

@@ -11,15 +11,15 @@ import java.text.ParseException;
  */
 public interface ApiFlowService {
 
-    void deleteFlow(String flowName, String workspaceName);
+    void deleteFlow(String param);
 
-    void start(String flowName, String workspaceName) throws ParseException;
+    void start(String param) throws ParseException;
 
-    void repealSchedule(String flowName, String workspaceName) throws ParseException;
+    void repealSchedule(String param) throws ParseException;
 
-    void killSchedule(String flowName, String workspaceName);
+    void killSchedule(String param);
 
-    String stopSchedule(String flowName, String workspaceName);
+    String stopSchedule(String param);
 
     void reStartSchedule(String runIds);
 

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

@@ -66,6 +66,17 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     @Resource
     private JobTaskRunLogMapper jobTaskRunLogMapper;
 
+    private void parseParam(String param, String workspaceName, String flowName){
+        ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
+        JSONObject jsonObject = JSON.parseObject(param);
+        //获取工作空间名称
+        workspaceName = jsonObject.getString("workspaceName");
+        ValidationUtil.dataNotBank(workspaceName, "工作空间名称不允许为空！");
+        //获取工作流名称
+        flowName = jsonObject.getString("flowName");
+        ValidationUtil.dataNotBank(flowName, "工作流名称不允许为空！");
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void publishFlow(String param) throws Exception {
@@ -590,7 +601,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteFlow(String flowName, String workspaceName) {
+    public void deleteFlow(String param) {
+        String workspaceName = "";
+        String flowName = "";
+        parseParam(param, workspaceName, flowName);
         log.info("删除工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -634,7 +648,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void start(String flowName, String workspaceName) throws ParseException {
+    public void start(String param) throws ParseException {
+        String workspaceName = "";
+        String flowName = "";
+        parseParam(param, workspaceName, flowName);
         log.info("开始工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -648,7 +665,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void repealSchedule(String flowName, String workspaceName) throws ParseException {
+    public void repealSchedule(String param) throws ParseException {
+        String workspaceName = "";
+        String flowName = "";
+        parseParam(param, workspaceName, flowName);
         log.info("撤销工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
@@ -697,13 +717,16 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     }
 
     @Override
-    public void killSchedule(String flowName, String workspaceName) {
+    public void killSchedule(String flowName) {
 
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String stopSchedule(String flowName, String workspaceName) {
+    public String stopSchedule(String param) {
+        String workspaceName = "";
+        String flowName = "";
+        parseParam(param, workspaceName, flowName);
         log.info("停止工作空间【{}】---工作流【{}】调度", workspaceName, flowName);
         Workspace workspace = workspaceMapper.getByName(workspaceName);
         ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");