对接 任务信息

build-run.sh

@@ -6,4 +6,4 @@ docker build -t crowd_review:0.2 .
 docker run --name crowd_review --rm -it -v /Users/major/development/crowd_review/deploy.sh:/project/deploy.sh -p 8090:8090 -e MONGODB_REVIEW_DB=crowd_review -e MONGODB_REVIEW_HOST=host.docker.internal -e MONGODB_REVIEW_PORT=27017 -e MONGODB_REPORT_DB=co-report -e MONGODB_REPORT_HOST=host.docker.internal -e MONGODB_REPORT_PORT=27017 -e EXPORT_ADDR=http://182.254.197.194:9002/generateReport crowd_review:0.2 /bin/sh
 
 
-docker run --name crowd_review --rm -it -v /root/moooc_review/deploy.sh:/project/deploy.sh -p 80:8090 -e MONGODB_REVIEW_DB=crowd_review -e MONGODB_REVIEW_HOST=10.81.65.118 -e MONGODB_REVIEW_PORT=29019 -e MONGODB_REPORT_DB=co-report -e MONGODB_REPORT_HOST=10.81.65.118 -e MONGODB_REPORT_PORT=29019 -e EXPORT_ADDR=http://182.254.197.194:9002/generateReport crowd_review:0.2 /bin/sh
+docker run --name crowd_review --rm -it -p 80:8090 -e MONGODB_REVIEW_DB=crowd_review -e MONGODB_REVIEW_HOST=10.81.65.118 -e MONGODB_REVIEW_PORT=29019 -e MONGODB_REPORT_DB=co-report -e MONGODB_REPORT_HOST=10.81.65.118 -e MONGODB_REPORT_PORT=29019 -e EXPORT_ADDR=http://47.99.140.117:9002/generateReport crowd_review:0.2 /bin/sh

src/main/java/com/mooctest/service/TaskService.java

@@ -1,31 +1,32 @@
 package com.mooctest.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.mooctest.dao.MasterReportDao;
 import com.mooctest.data.TaskDTO;
 import com.mooctest.model.Task;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class TaskService {
-    List<Task> tasks = Arrays.asList(
-            new Task(2613, 1489, "途牛旅游", "/static/images/apps/tuniu.png", "9.56.0", 0, "2018-11-12", "2018-12-20"),
-            new Task(2613, 1489, "花田小憩", "/static/images/apps/huatianxiaoqi.png", "6.5.0", 1, "2018-10-12", "2018-10-20"),
-            new Task(2613, 1489, "小猿搜题", "/static/images/apps/xiaoyuansouti.png", "8.5.0", 1, "2018-10-03", "2018-10-15"),
-            new Task(2613, 1489, "途牛旅游", "/static/images/apps/tuniu.png", "9.50.0", 1, "2018-10-02", "2018-10-12"),
-            new Task(2613, 1489, "JayMe", "/static/images/apps/JayMe.jpeg", "3.5.8", 1, "2018-10-01", "2018-11-01"),
-            new Task(2613, 1489, "和苗智家", "/static/images/apps/hemiaozhijia.png", "1.0.8", 1, "2018-09-22", "2018-09-29"),
-            new Task(2613, 1489, "邻里快讯", "/static/images/apps/linlikuaixun.png", "2.1.3", 1, "2018-09-18", "2018-09-29"),
-            new Task(2613, 1489, "探记", "/static/images/apps/tanji.png", "4.1.0", 1, "2018-09-13", "2018-09-22"),
-            new Task(2973, 1717, "月度赛", "/static/images/apps/tanji.png", "4.1.0", 1, "2018-09-13", "2018-09-22")
-    );
+//    List<Task> tasks = Arrays.asList(
+//            new Task(2613, 1489, "途牛旅游", "/static/images/apps/tuniu.png", "9.56.0", 0, "2018-11-12", "2018-12-20"),
+//            new Task(2613, 1489, "花田小憩", "/static/images/apps/huatianxiaoqi.png", "6.5.0", 1, "2018-10-12", "2018-10-20"),
+//            new Task(2613, 1489, "小猿搜题", "/static/images/apps/xiaoyuansouti.png", "8.5.0", 1, "2018-10-03", "2018-10-15"),
+//            new Task(2613, 1489, "途牛旅游", "/static/images/apps/tuniu.png", "9.50.0", 1, "2018-10-02", "2018-10-12"),
+//            new Task(2613, 1489, "JayMe", "/static/images/apps/JayMe.jpeg", "3.5.8", 1, "2018-10-01", "2018-11-01"),
+//            new Task(2613, 1489, "和苗智家", "/static/images/apps/hemiaozhijia.png", "1.0.8", 1, "2018-09-22", "2018-09-29"),
+//            new Task(2613, 1489, "邻里快讯", "/static/images/apps/linlikuaixun.png", "2.1.3", 1, "2018-09-18", "2018-09-29"),
+//            new Task(2613, 1489, "探记", "/static/images/apps/tanji.png", "4.1.0", 1, "2018-09-13", "2018-09-22"),
+//            new Task(2973, 1717, "月度赛", "/static/images/apps/tanji.png", "4.1.0", 1, "2018-09-13", "2018-09-22")
+//    );
 
     @Autowired
     MasterReportDao masterReportDao;
@@ -33,42 +34,54 @@ public class TaskService {
     @Autowired
     BugReportService bugReportService;
 
+    @Value("${task.info.addr}")
+    String taskInfoAddr;
+
     public List<TaskDTO> getAllTasks() {
-        return tasks.stream()
-                .map(task -> {
-                    TaskDTO taskDTO = new TaskDTO();
-                    BeanUtils.copyProperties(task, taskDTO);
-                    return taskDTO;
-                })
+        RestTemplate rt = new RestTemplate();
+
+        JSONObject tasksJson = JSON.parseObject(rt.getForObject(taskInfoAddr, String.class));
+        ListIterator<Object> tasksIter = tasksJson.getJSONArray("data").listIterator();
+
+        List<TaskDTO> dtos = new ArrayList<>();
+        while (tasksIter.hasNext()) {
+            JSONObject taskInfo = (JSONObject) tasksIter.next();
+
+            TaskDTO dto = new TaskDTO();
+            dto.setExamId(Long.parseLong(taskInfo.getString("task_id")));
+            dto.setCaseId(Long.parseLong(taskInfo.getString("case_id")));
+            dto.setName(taskInfo.getString("name"));
+
+            dtos.add(dto);
+        }
+
+        return dtos.stream()
                 .map(taskDTO -> {
-                    if (taskDTO.getName().equals("途牛旅游") && taskDTO.getVersion().equals("9.56.0")) {
-                        long totalBugs = masterReportDao.countByExamIdAndCaseId(taskDTO.getExamId(), taskDTO.getCaseId());
-                        long undealBugs = 0;
-                        if (totalBugs == 0) {
-                            totalBugs = bugReportService.getAllBugs(taskDTO.getExamId(), taskDTO.getCaseId()).size();
-                            undealBugs = totalBugs;
-                        } else {
-                            undealBugs = masterReportDao.countByExamIdAndCaseIdAndStatus(taskDTO.getExamId(), taskDTO.getCaseId(), 0);
-                        }
-                        taskDTO.setNumOfTotalBug(totalBugs);
-                        taskDTO.setNumOfUndeal(undealBugs);
+                    long totalBugs = masterReportDao.countByExamIdAndCaseId(taskDTO.getExamId(), taskDTO.getCaseId());
+                    long undealBugs = 0;
+                    if (totalBugs == 0) {
+                        totalBugs = bugReportService.getAllBugs(taskDTO.getExamId(), taskDTO.getCaseId()).size();
+                        undealBugs = totalBugs;
                     } else {
-                        Random r = new Random();
-                        int n = r.nextInt(100)%(100-20+1) + 20;
-                        taskDTO.setNumOfTotalBug(n * 10);
-                        taskDTO.setNumOfUndeal(0);
+                        undealBugs = masterReportDao.countByExamIdAndCaseIdAndStatus(taskDTO.getExamId(), taskDTO.getCaseId(), 0);
                     }
+                    taskDTO.setNumOfTotalBug(totalBugs);
+                    taskDTO.setNumOfUndeal(undealBugs);
+
                     return taskDTO;
-                }).sorted(Comparator.comparing(TaskDTO::getStatus))
+                }).sorted(Comparator.comparing(TaskDTO::getExamId).reversed())
                 .collect(Collectors.toList());
 
     }
 
     public TaskDTO getByExamIdAndCaseId(long examId, long caseId) {
-        Task taskDefault = new Task(examId, caseId, "途牛旅游", "/static/images/apps/tuniu.png", "9.56.0", 0, "2018-11-12", "2018-12-20");
-        Task t = tasks.stream().filter(task -> task.getExamId() == examId && task.getCaseId() == caseId).findFirst().orElse(taskDefault);
-        TaskDTO taskDTO = new TaskDTO();
-        BeanUtils.copyProperties(t, taskDTO);
+        TaskDTO taskDefault = new TaskDTO();
+        taskDefault.setExamId(examId);
+        taskDefault.setCaseId(caseId);
+        taskDefault.setName("no name");
+        List<TaskDTO> tasks = getAllTasks();
+        TaskDTO taskDTO = tasks.stream().filter(task -> task.getExamId() == examId && task.getCaseId() == caseId).findFirst().orElse(taskDefault);
+
         long totalBugs = masterReportDao.countByExamIdAndCaseId(taskDTO.getExamId(), taskDTO.getCaseId());
         long undealBugs = 0;
         if (totalBugs == 0) {

src/main/resources/application.yml

@@ -28,7 +28,8 @@ mongodb2.database: co-report
 mongodb2.host: localhost
 mongodb2.port: 27017
 
-report.export.addr: http://182.254.197.194:9002/generateReport
+report.export.addr: http://47.99.140.117:9002/generateReport
+task.info.addr: http://47.99.140.117:9001/Bug/api/extra/getExamList
 
 server:
     port: 8090
@@ -53,6 +54,8 @@ mongodb2.host: ${MONGODB_REPORT_HOST}
 mongodb2.port: ${MONGODB_REPORT_PORT}
 
 report.export.addr: ${EXPORT_ADDR}
+task.info.addr: ${TASK_ADDR}
+
 server:
     port: 8090
 logging:

src/main/resources/templates/task_list.html

@@ -79,12 +79,12 @@
 
             <table id="task-list" class="table table-striped text-center" style="margin-top: 10px">
                 <thead><tr>
-                    <th></th>
+                    <!--<th></th>-->
                     <th>应用名</th>
-                    <th>版本</th>
+                    <!--<th>版本</th>-->
                     <th>审核状态</th>
-                    <th>开始时间</th>
-                    <th>结束时间</th>
+                    <!--<th>开始时间</th>-->
+                    <!--<th>结束时间</th>-->
                     <th>审核进度</th>
                     <th>未审核数</th>
                 </tr></thead>
@@ -92,13 +92,13 @@
                 <th:block th:each="task : ${tasks}">
 
                     <tr>
-                        <td><img th:src="${task.icon}" style="width: 25px; height: 25px;" /></td>
+                        <!--<td><img th:src="${task.icon}" style="width: 25px; height: 25px;" /></td>-->
                         <td><b><a href="#" id="task-name" th:text="${task.name}">{{ task.name }}</a></b></td>
-                        <td th:text="${task.version}"></td>
+                        <!--<td th:text="${task.version}"></td>-->
                         <td th:if="${task.numOfUndeal > 0}"><span  class="label label-info">审核中</span></td>
                         <td th:if="${task.numOfUndeal == 0}"><span  class="label label-success">审核结束</span></td>
-                        <td th:text="${task.startTime}">{{ task.print_start_time }}</td>
-                        <td th:text="${task.endTime}">{{ task.print_end_time }}</td>
+                        <!--<td th:text="${task.startTime}">{{ task.print_start_time }}</td>-->
+                        <!--<td th:text="${task.endTime}">{{ task.print_end_time }}</td>-->
                         <td style="width: 200px;">
                             <a th:href="'/task_detail?examId=' + ${task.examId} + '&amp;caseId=' + ${task.caseId}">
                                 <div class="progress">