更改 batchEditNodeContent 返回格式

Author: SunPengWan

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/response/BatchEditNodeContentResponse.java

@@ -0,0 +1,54 @@
+package com.webank.wedatasphere.dss.workflow.entity.response;
+
+import java.util.List;
+
+public class BatchEditNodeContentResponse {
+
+    private Long orchestratorId;
+    private String orchestratorName;
+
+    private List<String> failNodeName;
+    private List<String> successNodeName;
+
+    private String errorMsg;
+    public Long getOrchestratorId() {
+        return orchestratorId;
+    }
+
+    public void setOrchestratorId(Long orchestratorId) {
+        this.orchestratorId = orchestratorId;
+    }
+
+    public String getOrchestratorName() {
+        return orchestratorName;
+    }
+
+    public void setOrchestratorName(String orchestratorName) {
+        this.orchestratorName = orchestratorName;
+    }
+
+
+    public List<String> getFailNodeName() {
+        return failNodeName;
+    }
+
+    public void setFailNodeName(List<String> failNodeName) {
+        this.failNodeName = failNodeName;
+    }
+
+    public List<String> getSuccessNodeName() {
+        return successNodeName;
+    }
+
+    public void setSuccessNodeName(List<String> successNodeName) {
+        this.successNodeName = successNodeName;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+}

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java

@@ -44,6 +44,7 @@
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.entity.DSSFlowEditLock;
 import com.webank.wedatasphere.dss.workflow.entity.request.*;
+import com.webank.wedatasphere.dss.workflow.entity.response.BatchEditNodeContentResponse;
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import com.webank.wedatasphere.dss.common.service.BMLService;
@@ -448,14 +449,19 @@ public Message batchEditNodeContent(@RequestBody BatchEditNodeContentRequest bat
             String ticketId = Arrays.stream(cookies).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName())).findFirst().map(Cookie::getValue).get();
             batchEditNodeContentRequest.setUsername(userName);
             LOGGER.info("batchEditNodeContent params is {}",batchEditNodeContentRequest);
-            flowService.batchEditNodeContent(batchEditNodeContentRequest,ticketId);
+            BatchEditNodeContentResponse batchEditNodeContentResponse = flowService.batchEditNodeContent(batchEditNodeContentRequest,ticketId);
 
+            if(batchEditNodeContentResponse !=null && !CollectionUtils.isNotEmpty(batchEditNodeContentResponse.getFailNodeName())){
+                return Message.error(String.format("批量编辑节点失败")).data("data",batchEditNodeContentResponse);
+            }
+
+            return  Message.ok("批量编辑节点完成").data("data",batchEditNodeContentResponse);
         }catch (Exception e){
             LOGGER.error("批量编辑节点失败", e);
             return Message.error(String.format("批量编辑节点失败，原因为：%s" , e.getMessage()));
         }
 
-        return  Message.ok("批量编辑节点成功");
+
     }
 
 

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java

@@ -128,7 +128,7 @@ QueryNodeInfoByPathResponse queryNodeInfo(Long projectId,
 
     void editNodeContent(EditNodeContentRequest editNodeContentRequest,String ticketId) throws Exception;
 
-    void batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeContentRequest,String ticketId) throws Exception;
+    BatchEditNodeContentResponse batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeContentRequest,String ticketId) throws Exception;
 
 
     List<DSSNodeDefault> getNodeInfoByName(QueryNodeInfoByNameRequest queryNodeInfoByNameRequest);

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java

@@ -2941,7 +2941,7 @@ public void editNodeContent(EditNodeContentRequest editNodeContentRequest,String
 
 
     @Override
-    public void batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeContentRequest,String ticketId) throws Exception {
+    public BatchEditNodeContentResponse batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeContentRequest,String ticketId) throws Exception {
 
         String username = batchEditNodeContentRequest.getUsername();
         Long projectId = batchEditNodeContentRequest.getProjectId();
@@ -2981,12 +2981,18 @@ public void batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeConten
         // 校验工作流是否锁定
         validateFlowLock(rootFlow, ticketId);
 
+        BatchEditNodeContentResponse batchEditNodeContentResponse = new BatchEditNodeContentResponse();
+        batchEditNodeContentResponse.setOrchestratorId(dssOrchestratorInfo.getId());
+        batchEditNodeContentResponse.setOrchestratorName(dssOrchestratorInfo.getName());
+
         // 锁定工作流
         lockFlow(rootFlow, username, ticketId);
 
         try {
 
             Map<Long,DSSFlow> flowMap = new HashMap<>();
+
+            Map<Long,List<String>> flowNodeMap = new HashMap<>();
             // 查找出节点所属的工作流 并分组
             for(BatchEditNodeContentRequest.NodeContent nodeContent: nodeContentList){
 
@@ -3011,26 +3017,41 @@ public void batchEditNodeContent(BatchEditNodeContentRequest batchEditNodeConten
 
                 flowMap.put(flow.getId(),flow);
 
+                flowNodeMap.getOrDefault(flow.getId(), new ArrayList<>()).add(nodeContent.getNodeName());
+
             }
 
+
             // 保存工作流
             for(Long flowId: flowMap.keySet()){
 
-                DSSFlow dssFlow = flowMap.get(flowId);
-                logger.info("orchestrator is [{},{}],flow is [{},{}],update dssFlow json is {}",
-                        dssOrchestratorInfo.getName(),dssOrchestratorInfo.getId(),
-                        flowId,dssFlow.getName(),
-                        dssFlow.getFlowJson());
-                saveFlow(flowId,dssFlow.getFlowJson(),username,dssFlow.getDescription(),
-                        dssProject.getWorkspaceName(),dssProject.getName(),null);
+                try {
+                    DSSFlow dssFlow = flowMap.get(flowId);
+                    logger.info("orchestrator is [{},{}],flow is [{},{}],update dssFlow json is {}",
+                            dssOrchestratorInfo.getName(),dssOrchestratorInfo.getId(),
+                            flowId,dssFlow.getName(),
+                            dssFlow.getFlowJson());
+                    saveFlow(flowId,dssFlow.getFlowJson(),username,dssFlow.getDescription(),
+                            dssProject.getWorkspaceName(),dssProject.getName(),null);
+
+                    batchEditNodeContentResponse.setSuccessNodeName(flowNodeMap.get(flowId));
+                }catch (Exception e){
+                    batchEditNodeContentResponse.setFailNodeName(flowNodeMap.get(flowId));
+                    batchEditNodeContentResponse.setErrorMsg(e.getMessage());
+                    logger.error("保存工作流失败", e);
+                    break;
+                }
+
             }
 
         }catch (Exception e){
-            logger.error("保存工作流失败", e);
+            logger.error("保存编排失败", e);
             throw new DSSErrorException(80001,"保存失败，原因为：" + e.getMessage());
         }finally {
             workFlowManager.unlockWorkflow(username,dssOrchestratorVersion.getAppId(),true,workspace);
         }
+        
+        return batchEditNodeContentResponse;
 
     }