修改获取众审答案统计结果的接口

src/main/java/edu/nju/dao/ReviewWorkerDao.java

@@ -1,6 +1,8 @@
 package edu.nju.dao;
 
 import edu.nju.entities.ReviewWorker;
+import edu.nju.model.ReviewWorkerVO;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -8,6 +10,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import edu.nju.util.HTTP;
 
 @Repository
 public class ReviewWorkerDao {
@@ -48,4 +51,21 @@ public class ReviewWorkerDao {
         if(list.size() == 0 || list == null) {return null;}
         return list.get(0);
     }
+
+    public ReviewWorkerVO getEduInfo(ReviewWorker reviewWorker) {
+        String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + reviewWorker.getOriginal_id(), "");
+        String name = "";
+        String school = "";
+        if (result != null && !result.equals("")) {
+            JSONObject json = new JSONObject(result);
+            if (json.has("name") && !json.isNull("name")) {
+                name = json.getString("name");
+            }
+            if (json.has("school") && !json.isNull("school")) {
+                school = json.getString("school");
+            }
+            return new ReviewWorkerVO(reviewWorker, name, school);
+        }
+        return null;
+    }
 }

src/main/java/edu/nju/service/ReviewAnalyzeService.java

@@ -2,8 +2,11 @@ package edu.nju.service;
 
 import edu.nju.dao.ReviewAnswerDao;
 import edu.nju.dao.ReviewItemDao;
+import edu.nju.dao.ReviewWorkerDao;
 import edu.nju.entities.ReviewAnswer;
 import edu.nju.entities.ReviewItem;
+import edu.nju.entities.ReviewWorker;
+import edu.nju.model.ReviewWorkerVO;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +21,8 @@ public class ReviewAnalyzeService {
     ReviewAnswerDao reviewAnswerDao;
     @Autowired
     ReviewItemDao reviewItemDao;
+    @Autowired
+    ReviewWorkerDao reviewWorkerDao;
 
     public JSONObject analyzeItem(String itemId,String reportId,String jobId){
         JSONObject jsonObject=new JSONObject();
@@ -31,7 +36,9 @@ public class ReviewAnalyzeService {
                 List<String>urls=reviewAnswer.getFile_url();
                 if(urls.size()!=0){
                     String workerId=reviewAnswer.getWorker_id();
-                    map.put(workerId,urls);
+                    ReviewWorker worker=reviewWorkerDao.find(workerId);
+                    ReviewWorkerVO workerVO=reviewWorkerDao.getEduInfo(worker);
+                    map.put(new JSONObject(workerVO).toString(),urls);
                 }
             }
             jsonObject=new JSONObject(map);
@@ -44,7 +51,9 @@ public class ReviewAnalyzeService {
                 if(answers.size()!=0){
                     String answer=answers.get(0);
                     String workerId=reviewAnswer.getWorker_id();
-                    map.put(workerId,answer);
+                    ReviewWorker worker=reviewWorkerDao.find(workerId);
+                    ReviewWorkerVO workerVO=reviewWorkerDao.getEduInfo(worker);
+                    map.put(new JSONObject(workerVO).toString(),answer);
                 }
             }
             jsonObject=new JSONObject(map);