dss-server: fix rollback

Author: qweqnotallow

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java

@@ -474,8 +474,9 @@ public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, Stri
         String newCommitId = versionByOrchestratorId.get(0).getCommitId();
         commitInfoBetweenRequest.setNewCommitId(newCommitId);
         String oldCommitId = null;
+        int i = 0;
         for (DSSOrchestratorVersion version : versionByOrchestratorId) {
-            if (version.getCommitId()!= null && !version.getCommitId().equals(newCommitId)) {
+            if (version.getCommitId()!= null && i++ != 0) {
                 oldCommitId = version.getCommitId();
                 break;
             }

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java

@@ -442,26 +442,8 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
         DSSOrchestratorVersion dssOrchestratorVersion = rollBackGitVo.getDssOrchestratorVersion();
         DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
         if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-            try {
-                DSSFlow dssFlow = flowMapper.selectFlowByID(dssOrchestratorVersion.getAppId());
-                if (!dssFlow.getName().equals(dssOrchestratorInfo.getName())) {
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                    return ;
-                }
-                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-                //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
-                if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                } else {
-                    GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
-                    GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
-                    lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
-                }
-            } catch (Exception e) {
-                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                throw e;
-            }
+            DSSFlow dssFlow = flowMapper.selectFlowByID(dssOrchestratorVersion.getAppId());
+            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
 
     }