Merge branch 'prod' of http://git.mooctest.net/summer/crowdsource-backend into prod

src/main/java/edu/nju/controller/NodeController.java

@@ -101,6 +101,22 @@ public class NodeController {
         }
     }
 
+    @RequestMapping(value = "/uploadSingleCatchNodes")
+    @ResponseBody
+    public void uploadSingleCatchNodes(String jobId,HttpServletResponse response){
+        JSONObject result;
+        try {
+            PrintWriter out = response.getWriter();
+            result=nodeService.uploadSingleCatchNodesToMoocTest(jobId);
+            out.print(result);
+            out.flush();
+            out.close();
+        }catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
 
 
 

src/main/java/edu/nju/entities/ReviewPaper.java

@@ -35,7 +35,7 @@ public class ReviewPaper implements java.io.Serializable{
         this.requirement_location = requirement_location;
     }
 
-    @PersistenceConstructor
+
     public ReviewPaper(ReviewPaperVO reviewPaperVO) {
         this.description = reviewPaperVO.getDescription();
         this.name = reviewPaperVO.getName();

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

@@ -553,6 +553,23 @@ public class NodeService {
 
     }
 
+    public JSONObject uploadSingleCatchNodesToMoocTest(String jobId){
+        List<ReviewWorker>reviewWorkers=reviewWorkerDao.getWorkersByJob(jobId);
+        List<String>failList=new ArrayList<>();
+        if(reviewWorkers!=null){
+            for(int i=0;i<reviewWorkers.size();i++){
+                JSONObject result=uploadSingleCatchNodeToMoocTest(jobId,reviewWorkers.get(i).getId());
+                if(!result.get("status").equals("200")){
+                    failList.add(reviewWorkers.get(i).getId());
+                }
+            }
+        }
+        JSONArray jsonArray=new JSONArray(failList);
+        JSONObject result=new JSONObject();
+        result.put("failWorker",jsonArray);
+        return result;
+    }
+
 
 
 }

src/main/java/edu/nju/util/BlockChainAspect.java

@@ -83,7 +83,7 @@ public class BlockChainAspect {
 
 
 
-        String defaultString="default";
+        String defaultString="慕测管理员";
 
         JSONObject bugReviewVO=new JSONObject();
 

src/workerDIstribution

@@ -0,0 +1,12 @@
+{
+	name:"dis1",
+	"description:"des1",
+	"worker":{"worker1","worker2","worker3"},
+	"report":{"rep1","rep2","rep3"}
+},
+{
+    name:"dis2",
+	"description:"des2",
+	"worker":{"worker4","worker5","worker6"},
+	"report":{"rep4","rep5"}
+}