From 32df172547cd5a03004b889a8f125d30e6fdb6f6 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 26 Feb 2020 13:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectController.java         | 12 +++++++
 .../metersphere/service/ProjectService.java   | 11 ++++++
 frontend/src/i18n/en_US.js                    |  3 ++
 frontend/src/i18n/zh_CN.js                    |  3 ++
 .../components/project/RecentProject.vue      | 36 ++++++++-----------
 .../performance/components/router/router.js   |  3 +-
 .../components/testPlan/AllTestPlan.vue       |  4 +++
 7 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/ProjectController.java b/backend/src/main/java/io/metersphere/controller/ProjectController.java
index 9daf139dcc..fa67a7de67 100644
--- a/backend/src/main/java/io/metersphere/controller/ProjectController.java
+++ b/backend/src/main/java/io/metersphere/controller/ProjectController.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.service.ProjectService;
 import io.metersphere.user.SessionUtils;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,6 +30,17 @@ public class ProjectController {
         return projectService.getProjectList(request);
     }
 
+    @GetMapping("/recent/{count}")
+    @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
+    public List<Project> recentProjects(@PathVariable int count) {
+        String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId();
+        ProjectRequest request = new ProjectRequest();
+        request.setWorkspaceId(currentWorkspaceId);
+        // 最近 `count` 个项目
+        PageHelper.startPage(1, count);
+        return projectService.getRecentProjectList(request);
+    }
+
     @PostMapping("/add")
     @RequiresRoles(RoleConstants.TEST_MANAGER)
     public Project addProject(@RequestBody Project project) {
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index b9fce1d079..4cfe911cec 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -63,4 +63,15 @@ public class ProjectService {
     public List<Project> listAll() {
         return projectMapper.selectByExample(null);
     }
+
+    public List<Project> getRecentProjectList(ProjectRequest request) {
+        ProjectExample example = new ProjectExample();
+        ProjectExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(request.getWorkspaceId())) {
+            criteria.andWorkspaceIdEqualTo(request.getWorkspaceId());
+        }
+        // 按照修改时间排序
+        example.setOrderByClause("update_time desc");
+        return projectMapper.selectByExample(example);
+    }
 }
diff --git a/frontend/src/i18n/en_US.js b/frontend/src/i18n/en_US.js
index 3992d2caf5..a4578177cb 100644
--- a/frontend/src/i18n/en_US.js
+++ b/frontend/src/i18n/en_US.js
@@ -18,6 +18,9 @@ const en_US = {
     'input_name_2_50': '2 to 50 characters in length',
     'search_by_name': 'Search by name',
   },
+  project: {
+    'recent': 'Recent Projects'
+  },
   i18n: {
     'home': 'Home',
   }
diff --git a/frontend/src/i18n/zh_CN.js b/frontend/src/i18n/zh_CN.js
index ccb94cac38..ea742402e0 100644
--- a/frontend/src/i18n/zh_CN.js
+++ b/frontend/src/i18n/zh_CN.js
@@ -18,6 +18,9 @@ const zh_CN = {
     'input_name_2_50': '长度在 2 到 50 个字符',
     'search_by_name': '根据名称搜索',
   },
+  project: {
+    'recent': '最近的项目'
+  },
   i18n: {
     'home': '首页',
   }
diff --git a/frontend/src/performance/components/project/RecentProject.vue b/frontend/src/performance/components/project/RecentProject.vue
index 13f9b456a6..ecf04f1885 100644
--- a/frontend/src/performance/components/project/RecentProject.vue
+++ b/frontend/src/performance/components/project/RecentProject.vue
@@ -2,10 +2,10 @@
   <div>
     <div class="recent-text">
       <i class="el-icon-time"/>
-      最近的项目
+      {{$t('project.recent')}}
     </div>
-    <el-menu-item v-bind:key="recentTestPlan.id" v-for="recentTestPlan in recentTestPlans">
-      {{ recentTestPlan.name }}
+    <el-menu-item :key="recentProject.id" v-for="recentProject in recentProjects" @click="goTest(recentProject)">
+      {{ recentProject.name }}
     </el-menu-item>
   </div>
 </template>
@@ -13,26 +13,20 @@
 <script>
   export default {
     name: "RecentProject",
+    mounted() {
+      this.$get('/project/recent/5', (response) => {
+        this.recentProjects = response.data;
+      });
+    },
+    methods: {
+      goTest(project) {
+        window.console.log(project);
+        // this.$router.push({path: '/allTest', params: {projectId: project.id, projectName: project.name}});
+      }
+    },
     data() {
       return {
-        recentTestPlans: [
-          {
-            id: 1,
-            name: "项目1"
-          },
-          {
-            id: 2,
-            name: "项目2"
-          },
-          {
-            id: 3,
-            name: "项目3"
-          },
-          {
-            id: 4,
-            name: "项目4"
-          }
-        ]
+        recentProjects: [],
       }
     }
   }
diff --git a/frontend/src/performance/components/router/router.js b/frontend/src/performance/components/router/router.js
index 691c201c8f..80d57dee8b 100644
--- a/frontend/src/performance/components/router/router.js
+++ b/frontend/src/performance/components/router/router.js
@@ -86,7 +86,8 @@ const router = new VueRouter({
       path: "/allTest",
       components: {
         content: AllTestPlan
-      }
+      },
+      props: true,
     },
     {
       path: "/project",
diff --git a/frontend/src/performance/components/testPlan/AllTestPlan.vue b/frontend/src/performance/components/testPlan/AllTestPlan.vue
index e67e4cdfa3..675e6769be 100644
--- a/frontend/src/performance/components/testPlan/AllTestPlan.vue
+++ b/frontend/src/performance/components/testPlan/AllTestPlan.vue
@@ -80,6 +80,10 @@
 
 <script>
   export default {
+    props: {
+      projectId: String,
+      projectName: String
+    },
     data() {
       return {
         result: {},