展示树状视图

src/main/java/com/mooctest/dao/BugExtDao.java → src/main/java/com/mooctest/dao3/BugExtDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.Bug;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mooctest/dao/BugHistoryDao.java → src/main/java/com/mooctest/dao3/BugHistoryDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.BugHistory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +35,6 @@ public class BugHistoryDao {
 	public List<String> findRoots(List<String> lists) {
 		System.out.println("lists.toString()"+lists.toString());
 		if(lists == null || lists.size() == 0) {return new ArrayList<String>();}
-		System.out.println("roots: ");
 		Query query = new Query();
 		query.addCriteria(Criteria.where("_id").in(lists).and("parent").is("null"));
 		List<BugHistory> roots = mongoOps.find(query,BugHistory.class);

src/main/java/com/mooctest/dao/BugMirrorDao.java → src/main/java/com/mooctest/dao3/BugMirrorDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.BugMirror;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mooctest/dao/BugPageDao.java → src/main/java/com/mooctest/dao3/BugPageDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.BugPage;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mooctest/dao/BugScoreDao.java → src/main/java/com/mooctest/dao3/BugScoreDao.java

@@ -1,41 +1,41 @@
-package com.mooctest.dao;
-
-import com.mooctest.model.BugScore;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class BugScoreDao {
-	
-	@Autowired
-	private MongoOperations mongoOperations;
-	
-	public void save(BugScore score) {
-		mongoOperations.save(score);
-	}
-	
-	public BugScore findById(String id) {
-		Query query = new Query();
-	    query.addCriteria(Criteria.where("_id").is(id));
-	    List<BugScore> list = mongoOperations.find(query, BugScore.class);
-	    if(list != null && list.size() != 0) {return list.get(0);}
-	    return null;
-	}
-	
-	public List<BugScore> findByIds(List<String> list) {
-		Query query = new Query();
-	    query.addCriteria(Criteria.where("_id").in(list));
-	    return mongoOperations.find(query, BugScore.class);
-	}
-	
-	public void remove(List<String> ids) {
-		Query query = new Query();
-	    query.addCriteria(Criteria.where("_id").in(ids));
-	    mongoOperations.remove(query, BugScore.class);
-	}
-}
+package com.mooctest.dao3;
+
+import com.mooctest.model.BugScore;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class BugScoreDao {
+	
+	@Autowired
+	private MongoOperations mongoOperations;
+	
+	public void save(BugScore score) {
+		mongoOperations.save(score);
+	}
+	
+	public BugScore findById(String id) {
+		Query query = new Query();
+	    query.addCriteria(Criteria.where("_id").is(id));
+	    List<BugScore> list = mongoOperations.find(query, BugScore.class);
+	    if(list != null && list.size() != 0) {return list.get(0);}
+	    return null;
+	}
+	
+	public List<BugScore> findByIds(List<String> list) {
+		Query query = new Query();
+	    query.addCriteria(Criteria.where("_id").in(list));
+	    return mongoOperations.find(query, BugScore.class);
+	}
+	
+	public void remove(List<String> ids) {
+		Query query = new Query();
+	    query.addCriteria(Criteria.where("_id").in(ids));
+	    mongoOperations.remove(query, BugScore.class);
+	}
+}

src/main/java/com/mooctest/dao/CTBDao.java → src/main/java/com/mooctest/dao3/CTBDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.CaseToBug;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mooctest/dao/KWDao.java → src/main/java/com/mooctest/dao3/KWDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.KeyWords;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mooctest/dao/StuInfoDao.java → src/main/java/com/mooctest/dao3/StuInfoDao.java

@@ -1,4 +1,4 @@
-package com.mooctest.dao;
+package com.mooctest.dao3;
 
 import com.mooctest.model.StuInfo;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
 package com.mooctest.service;
 
-import com.mooctest.dao.*;
+import com.mooctest.dao3.*;
 import com.mooctest.model.*;
 import com.mooctest.util.HTTP;
 import org.json.JSONArray;
@@ -18,22 +18,22 @@ import java.util.Map;
 public class AnalyzeService {
 	
 	@Autowired
-    CTBDao ctbdao;
+	CTBDao ctbdao;
 	
 	@Autowired
-    BugScoreDao bsdao;
+	BugScoreDao bsdao;
 	
 	@Autowired
-    BugHistoryDao hdao;
+	BugHistoryDao hdao;
 	
 	@Autowired
-    BugMirrorDao mdao;
+	BugMirrorDao mdao;
 	
 	@Autowired
-    StuInfoDao studao;
+	StuInfoDao studao;
 	
 	@Autowired
-    BugExtDao bdao;
+	BugExtDao bdao;
 	
 	@Autowired
     HistoryService hservice;
@@ -42,7 +42,7 @@ public class AnalyzeService {
 	public List<String> getValid(String case_take_id) {
 		List<String> result = new ArrayList<String>();
 		List<BugMirror> mirrors = mdao.findValid(case_take_id);
-		System.out.println("mirrors: "+ mirrors);
+//		System.out.println("mirrors: "+ mirrors);
 		for(BugMirror ctb : mirrors) {
 			result.add(ctb.getId());
 		}

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

@@ -1,8 +1,8 @@
 package com.mooctest.service;
 
-import com.mooctest.dao.BugHistoryDao;
-import com.mooctest.dao.BugMirrorDao;
-import com.mooctest.dao.BugPageDao;
+import com.mooctest.dao3.BugHistoryDao;
+import com.mooctest.dao3.BugMirrorDao;
+import com.mooctest.dao3.BugPageDao;
 import com.mooctest.model.BugHistory;
 import com.mooctest.model.BugMirror;
 import com.mooctest.model.BugPage;
@@ -64,7 +64,6 @@ public class HistoryService {
 	}
 	
 	public List<String> getRoots(String case_take_id) {
-		System.out.println("getRoots: ");
 		return historydao.findRoots(aservice.getValid(case_take_id));
 	}
 	

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

@@ -1,9 +1,9 @@
 package com.mooctest.service;
 
-import com.mooctest.dao.BugExtDao;
-import com.mooctest.dao.BugMirrorDao;
-import com.mooctest.dao.BugPageDao;
-import com.mooctest.dao.KWDao;
+import com.mooctest.dao3.BugExtDao;
+import com.mooctest.dao3.BugMirrorDao;
+import com.mooctest.dao3.BugPageDao;
+import com.mooctest.dao3.KWDao;
 import com.mooctest.model.Bug;
 import com.mooctest.model.BugMirror;
 import com.mooctest.model.BugPage;

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

@@ -19,17 +19,17 @@ 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;
@@ -41,45 +41,76 @@ public class TaskService {
     String taskInfoAddr;
 
     public List<TaskDTO> getAllTasks() {
-        RestTemplate rt = new RestTemplate();
-        StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
-        list.add(stringHttpMessageConverter);
-        rt.setMessageConverters(list);
-        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()
+        return tasks.stream()
+                .map(task -> {
+                    TaskDTO taskDTO = new TaskDTO();
+                    BeanUtils.copyProperties(task, taskDTO);
+                    return taskDTO;
+                })
                 .map(taskDTO -> {
-                    long totalBugs = masterReportDao.countByExamIdAndCaseId(taskDTO.getExamId(), taskDTO.getCaseId());
-                    long undealBugs = 0;
-                    if (totalBugs == 0) {
-                        totalBugs = bugReportService.getAllBugs(taskDTO.getExamId(), taskDTO.getCaseId()).size();
-                        undealBugs = totalBugs;
+                    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);
                     } else {
-                        undealBugs = masterReportDao.countByExamIdAndCaseIdAndStatus(taskDTO.getExamId(), taskDTO.getCaseId(), 0);
+                        Random r = new Random();
+                        int n = r.nextInt(100)%(100-20+1) + 20;
+                        taskDTO.setNumOfTotalBug(n * 10);
+                        taskDTO.setNumOfUndeal(0);
                     }
-                    taskDTO.setNumOfTotalBug(totalBugs);
-                    taskDTO.setNumOfUndeal(undealBugs);
-
                     return taskDTO;
-                }).sorted(Comparator.comparing(TaskDTO::getExamId).reversed())
+                }).sorted(Comparator.comparing(TaskDTO::getStatus))
                 .collect(Collectors.toList());
 
     }
 
+//    public List<TaskDTO> getAllTasks() {
+//        RestTemplate rt = new RestTemplate();
+//        StringHttpMessageConverter stringHttpMessageConverter=new StringHttpMessageConverter(Charset.forName("UTF-8"));
+//        List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
+//        list.add(stringHttpMessageConverter);
+//        rt.setMessageConverters(list);
+//        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 -> {
+//                    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);
+//
+//                    return taskDTO;
+//                }).sorted(Comparator.comparing(TaskDTO::getExamId).reversed())
+//                .collect(Collectors.toList());
+//
+//    }
+
     public TaskDTO getByExamIdAndCaseId(long examId, long caseId) {
         TaskDTO taskDefault = new TaskDTO();
         taskDefault.setExamId(examId);

src/main/resources/application.yml

@@ -21,11 +21,11 @@ spring:
 
 
 mongodb1.database: crowd_review
-mongodb1.host: 10.0.0.82
+mongodb1.host: 127.0.0.1
 mongodb1.port: 27017
 
 mongodb2.database: co-report
-mongodb2.host: 10.0.0.82
+mongodb2.host: 127.0.0.1
 mongodb2.port: 27017
 
 report.export.addr: http://47.99.140.117:9002/generateReport

target/classes/application.yml

@@ -21,11 +21,11 @@ spring:
 
 
 mongodb1.database: crowd_review
-mongodb1.host: 10.0.0.82
+mongodb1.host: 127.0.0.1
 mongodb1.port: 27017
 
 mongodb2.database: co-report
-mongodb2.host: 10.0.0.82
+mongodb2.host: 127.0.0.1
 mongodb2.port: 27017
 
 report.export.addr: http://47.99.140.117:9002/generateReport