From 8872fe81353bce016566ab281aca41d24ccf1724 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 28 Apr 2021 21:52:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtIssuesMapper.xml       |  4 +-
 .../track/controller/IssuesController.java    |  6 ++
 .../track/issue/AbstractIssuePlatform.java    |  2 +
 .../metersphere/track/issue/JiraPlatform.java |  2 +-
 .../metersphere/track/issue/TapdPlatform.java |  5 +-
 .../track/issue/ZentaoPlatform.java           | 11 ++-
 .../track/service/IssuesService.java          | 95 +++++++++++++++----
 .../components/track/issue/IssueList.vue      | 18 ++++
 frontend/src/common/js/table-constants.js     |  3 +-
 9 files changed, 124 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index ec761e99c5..4ff587bd67 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -12,7 +12,9 @@
     </select>
 
     <select id="getIssuesByProjectId" resultType="io.metersphere.base.domain.IssuesDao">
-        select issues.*
+        select issues.id, ifnull(issues.title, '') as title, issues.project_id, issues.create_time, issues.update_time,
+               ifnull(issues.description, '') as description, issues.status, issues.platform, issues.custom_fields, issues.reporter,
+               issues.lastmodify
         from issues
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
index 22f1b6cf33..54db197ede 100644
--- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Issues;
 import io.metersphere.base.domain.IssuesDao;
+import io.metersphere.base.domain.IssuesWithBLOBs;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.track.issue.domain.PlatformUser;
@@ -79,5 +80,10 @@ public class IssuesController {
         return issuesService.getZentaoBuilds(request);
     }
 
+    @PostMapping("/get/platform/issue")
+    public IssuesWithBLOBs getPlatformIssue(@RequestBody IssuesWithBLOBs issue) {
+        return issuesService.getPlatformIssue(issue);
+    }
+
 
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 085dfffa05..db6dbff2a2 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -162,6 +162,8 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         issues.setPlatform(issuesRequest.getPlatform());
         issues.setProjectId(issuesRequest.getProjectId());
         issues.setCustomFields(issuesRequest.getCustomFields());
+        issues.setCreateTime(System.currentTimeMillis());
+        issues.setUpdateTime(System.currentTimeMillis());
         issuesMapper.insert(issues);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index 06e3cd4c22..bf99769aa9 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -288,7 +288,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         return project.getJiraKey();
     }
 
-    private IssuesDao getJiraIssues(HttpHeaders headers, String url, String issuesId) {
+    public IssuesDao getJiraIssues(HttpHeaders headers, String url, String issuesId) {
         HttpEntity<MultiValueMap> requestEntity = new HttpEntity<>(headers);
         RestTemplate restTemplate = new RestTemplate();
         //post
diff --git a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
index cd6cdfdd9a..f20528667d 100644
--- a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
@@ -121,7 +121,7 @@ public class TapdPlatform extends AbstractIssuePlatform {
         return demandList;
     }
 
-    private IssuesDao getTapdIssues(String projectId, String issuesId) {
+    public IssuesDao getTapdIssues(String projectId, String issuesId) {
         String url = "https://api.tapd.cn/bugs?workspace_id=" + projectId + "&id=" + issuesId;
         ResultHolder call = call(url);
         String listJson = JSON.toJSONString(call.getData());
@@ -218,6 +218,9 @@ public class TapdPlatform extends AbstractIssuePlatform {
     public List<PlatformUser> getPlatformUser() {
         List<PlatformUser> users = new ArrayList<>();
         String id = getProjectId(projectId);
+        if (StringUtils.isBlank(id)) {
+            MSException.throwException("未关联Tapd项目ID");
+        }
         String url = "https://api.tapd.cn/workspaces/users?workspace_id=" + id;
         ResultHolder call = call(url);
         String listJson = JSON.toJSONString(call.getData());
diff --git a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
index e0f4b15a83..d9b5247e2a 100644
--- a/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/ZentaoPlatform.java
@@ -51,6 +51,13 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         this.url = object.getString("url");
     }
 
+    public ZentaoPlatform(String account, String password, String url) {
+        super(new IssuesRequest());
+        this.account = account;
+        this.password = password;
+        this.url = url;
+    }
+
     @Override
     String getProjectId(String projectId) {
         if (StringUtils.isNotBlank(projectId)) {
@@ -156,7 +163,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         return list;
     }
 
-    private IssuesDao getZentaoIssues(String bugId) {
+    public IssuesDao getZentaoIssues(String bugId) {
         String session = login();
         HttpEntity<MultiValueMap> requestEntity = new HttpEntity<>(new HttpHeaders());
         RestTemplate restTemplate = new RestTemplate();
@@ -204,7 +211,7 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
         String projectId = getProjectId(issuesRequest.getProjectId());
 
         if (StringUtils.isBlank(projectId)) {
-            MSException.throwException("add zentao bug fail, project zentao id is null");
+            MSException.throwException("未关联禅道项目ID.");
         }
 
         if (StringUtils.isBlank(session)) {
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index cae18d053d..07cf15da50 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -1,13 +1,18 @@
 package io.metersphere.track.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.IssueTemplateMapper;
 import io.metersphere.base.mapper.IssuesMapper;
 import io.metersphere.base.mapper.TestCaseIssuesMapper;
+import io.metersphere.base.mapper.WorkspaceMapper;
+import io.metersphere.base.mapper.ext.ExtIssuesMapper;
 import io.metersphere.commons.constants.IssuesManagePlatform;
 import io.metersphere.commons.constants.NoticeConstants;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
+import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.IntegrationRequest;
@@ -16,9 +21,7 @@ import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
 import io.metersphere.service.IntegrationService;
 import io.metersphere.service.ProjectService;
-import io.metersphere.track.issue.AbstractIssuePlatform;
-import io.metersphere.track.issue.IssueFactory;
-import io.metersphere.track.issue.ZentaoPlatform;
+import io.metersphere.track.issue.*;
 import io.metersphere.track.issue.domain.PlatformUser;
 import io.metersphere.track.issue.domain.ZentaoBuild;
 import io.metersphere.track.request.testcase.IssuesRequest;
@@ -26,6 +29,7 @@ import io.metersphere.track.request.testcase.IssuesUpdateRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,6 +55,10 @@ public class IssuesService {
     private TestCaseIssuesMapper testCaseIssuesMapper;
     @Resource
     private IssueTemplateMapper issueTemplateMapper;
+    @Resource
+    private ExtIssuesMapper extIssuesMapper;
+    @Resource
+    private WorkspaceMapper workspaceMapper;
 
     public void testAuth(String platform) {
         AbstractIssuePlatform abstractPlatform = IssueFactory.createPlatform(platform, new IssuesRequest());
@@ -274,17 +282,17 @@ public class IssuesService {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
 
 
-        List<IssuesDao> list = new ArrayList<>();
-        String projectId = request.getProjectId();
-        Project project = projectService.getProjectById(projectId);
-        List<String> platforms = getPlatforms(project);
-        platforms.add(IssuesManagePlatform.Local.toString());
-        List<AbstractIssuePlatform> platformList = IssueFactory.createPlatforms(platforms, request);
-        platformList.forEach(platform -> {
-            List<IssuesDao> issue = platform.getIssue(request);
-            list.addAll(issue);
-        });
-//        List<IssuesDao> issues = extIssuesMapper.getIssuesByProjectId(request);
+//        List<IssuesDao> list = new ArrayList<>();
+//        String projectId = request.getProjectId();
+//        Project project = projectService.getProjectById(projectId);
+//        List<String> platforms = getPlatforms(project);
+//        platforms.add(IssuesManagePlatform.Local.toString());
+//        List<AbstractIssuePlatform> platformList = IssueFactory.createPlatforms(platforms, request);
+//        platformList.forEach(platform -> {
+//            List<IssuesDao> issue = platform.getIssue(request);
+//            list.addAll(issue);
+//        });
+        List<IssuesDao> issues = extIssuesMapper.getIssuesByProjectId(request);
 //        Map<String, List<IssuesDao>> issueMap = getIssueMap(issues);
 //        Map<String, AbstractIssuePlatform> platformMap = getPlatformMap(request);
 //        issueMap.forEach((platformName, data) -> {
@@ -293,8 +301,8 @@ public class IssuesService {
 //                platform.filter(data);
 //            }
 //        });
-//        return issues;
-        return list;
+        return issues;
+//        return list;
     }
 
     public Map<String, List<IssuesDao>> getIssueMap(List<IssuesDao> issues) {
@@ -321,4 +329,59 @@ public class IssuesService {
         platforms.add(IssuesManagePlatform.Local.toString());
         return IssueFactory.createPlatformsForMap(platforms, request);
     }
+
+    public IssuesWithBLOBs getPlatformIssue(IssuesWithBLOBs issue) {
+        String platform = issue.getPlatform();
+        if (StringUtils.isNotBlank(issue.getProjectId())) {
+            Project project = projectService.getProjectById(issue.getProjectId());
+            Workspace workspace = workspaceMapper.selectByPrimaryKey(project.getWorkspaceId());
+            String orgId = workspace.getOrganizationId();
+            try {
+                if (StringUtils.equals(platform, IssuesManagePlatform.Tapd.name())) {
+                    TapdPlatform tapdPlatform = new TapdPlatform(new IssuesRequest());
+                    String tapdId = projectService.getProjectById(issue.getProjectId()).getTapdId();
+                    IssuesDao tapdIssues = tapdPlatform.getTapdIssues(tapdId, issue.getId());
+                    issue.setTitle(tapdIssues.getTitle());
+                    issue.setDescription(tapdIssues.getDescription());
+                    issue.setStatus(tapdIssues.getStatus());
+                } else if (StringUtils.equals(platform, IssuesManagePlatform.Jira.name())) {
+                    JiraPlatform jiraPlatform = new JiraPlatform(new IssuesRequest());
+                    String config = getConfig(orgId, IssuesManagePlatform.Jira.toString());
+                    JSONObject object = JSON.parseObject(config);
+                    HttpHeaders headers = jiraPlatform.getAuthHeader(object);
+                    String url = object.getString("url");
+                    IssuesDao jiraIssues = jiraPlatform.getJiraIssues(headers, url, issue.getId());
+                    issue.setTitle(jiraIssues.getTitle());
+                    issue.setDescription(jiraIssues.getDescription());
+                    issue.setStatus(jiraIssues.getStatus());
+                } else if (StringUtils.equals(platform, IssuesManagePlatform.Zentao.name())) {
+                    String config = getConfig(orgId, IssuesManagePlatform.Zentao.toString());
+                    JSONObject object = JSON.parseObject(config);
+                    String account = object.getString("account");
+                    String password = object.getString("password");
+                    String url = object.getString("url");
+                    ZentaoPlatform zentaoPlatform = new ZentaoPlatform(account, password, url);
+                    IssuesDao zentaoIssues = zentaoPlatform.getZentaoIssues(issue.getId());
+                    issue.setTitle(zentaoIssues.getTitle());
+                    issue.setDescription(zentaoIssues.getDescription());
+                    issue.setStatus(zentaoIssues.getStatus());
+                }
+            } catch (Exception e) {
+                LogUtil.error(e.getMessage(), e);
+            }
+        }
+        return issue;
+    }
+
+    private String getConfig(String orgId, String platform) {
+        IntegrationRequest request = new IntegrationRequest();
+        if (StringUtils.isBlank(orgId)) {
+            MSException.throwException("organization id is null");
+        }
+        request.setOrgId(orgId);
+        request.setPlatform(platform);
+
+        ServiceIntegration integration = integrationService.get(request);
+        return integration.getConfiguration();
+    }
 }
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index 04881225fc..f62238fc56 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -132,6 +132,24 @@ export default {
         let data = response.data;
         this.total = data.itemCount;
         this.tableData = data.listObject;
+        for (let i = 0; i < this.tableData.length; i++) {
+          if (this.tableData[i]) {
+            if (this.tableData[i].platform !== 'Local') {
+              this.$post("issues/get/platform/issue", this.tableData[i]).then(response => {
+                let issues = response.data.data;
+                if (issues) {
+                  this.$set(this.tableData[i], "title", issues.title ? issues.title : "--");
+                  this.$set(this.tableData[i], "description", issues.description ? issues.description : "--");
+                  this.$set(this.tableData[i], "status", issues.status ? issues.status : 'delete');
+                }
+              }).catch(() => {
+                this.$set(this.tableData[i], "title", "--");
+                this.$set(this.tableData[i], "description", "--");
+                this.$set(this.tableData[i], "status", "--");
+              });
+            }
+          }
+        }
       });
     },
     handleEdit(data) {
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index 2773bd9ff1..0fd309d6a7 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -65,5 +65,6 @@ export const ISSUE_STATUS_MAP = {
   'new': '新建',
   'closed': '已关闭',
   'resolved': '已解决',
-  'active': '激活'
+  'active': '激活',
+  'delete': '已删除'
 }