Merge remote-tracking branch 'origin/xjw' into xjw

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

@@ -55,10 +55,10 @@ public class ReviewJobController {
 
     @RequestMapping(value = "/uploadJob", method = RequestMethod.POST)
     @ResponseBody
-    public void uploadJob(String name, String description, String paperId, String startTime, String endTime, @RequestParam("workerList")List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum, HttpServletResponse response){
+    public void uploadJob(String name, String description, String paperId, String startTime, String endTime, @RequestParam("workerList")List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum,int maxWorker, HttpServletResponse response){
         try {
             PrintWriter out = response.getWriter();
-            JSONObject jsonObject = reviewJobService.uploadJob("","","",name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum);
+            JSONObject jsonObject = reviewJobService.uploadJob("","","",name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum,maxWorker);
             out.print(jsonObject);
             out.flush();
             out.close();
@@ -92,8 +92,8 @@ public class ReviewJobController {
 
     @RequestMapping(value = "/updateJob", method = RequestMethod.POST)
     @ResponseBody
-    public void updateJob(String jobId, String name, String description, String paperId,String startTime, String endTime,@RequestParam("workerList")List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum, HttpServletResponse response){
-        JSONObject result = reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum);
+    public void updateJob(String jobId, String name, String description, String paperId,String startTime, String endTime,@RequestParam("workerList")List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum, int maxWorker,HttpServletResponse response){
+        JSONObject result = reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum,maxWorker);
         try {
             PrintWriter out = response.getWriter();
             out.print(result);

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

@@ -34,8 +34,10 @@ public class ReviewJob implements java.io.Serializable{
 
     private int validationNum;
 
+    private int max_worker;
+
     @PersistenceConstructor
-    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id,String type, String start_time, String end_time, String group,Boolean isCrossValidation,Integer validationNum) {
+    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id,String type, String start_time, String end_time, String group,Boolean isCrossValidation,Integer validationNum,Integer max_worker) {
         this.exam_id=exam_id;
         this.case_id=case_id;
         this.description = description;
@@ -56,6 +58,12 @@ public class ReviewJob implements java.io.Serializable{
         }
         else
             this.validationNum=validationNum;
+        if(max_worker==null){
+            this.max_worker=0;
+        }
+        else{
+            this.max_worker=max_worker;
+        }
     }
     @PersistenceConstructor
     public ReviewJob(String exam_id, String paper_id,String create_time) {
@@ -174,4 +182,12 @@ public class ReviewJob implements java.io.Serializable{
     public void setType(String type) {
         this.type = type;
     }
+
+    public int getMax_worker() {
+        return max_worker;
+    }
+
+    public void setMax_worker(int max_worker) {
+        this.max_worker = max_worker;
+    }
 }

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

@@ -184,7 +184,7 @@ public class ExtraService {
 	}
 
 	public String reportsToReviewPaper(String case_take_id){
-		int[]options={1,2,3,4,5,6,7,8,9,10};
+		int[]options={0,1,2,3,4,5,6,7,8,9,10};
 		try {
 			CrowdSourceToReviewPaper crowdSourceToReviewPaper=crowdSourceToReviewPaperDao.getByCaseTakeId(case_take_id);
 			if(crowdSourceToReviewPaper!=null){
@@ -227,7 +227,7 @@ public class ExtraService {
 			result.put("description","");
 			result.put("name","");
 			result.put("create_time",String.valueOf(System.currentTimeMillis()));
-			result.put("type","众测任务");
+			result.put("type","众包测试");
 			result.put("application_url","");
 			result.put("requirement_url","");
 			JSONArray itemGroupArray=new JSONArray();

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

@@ -40,7 +40,7 @@ public class ReviewJobService {
         return jobDao.findJobs();
     }
 
-    public JSONObject uploadJob(String jobId,String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum){
+    public JSONObject uploadJob(String jobId,String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum,int maxWorker){
         JSONObject jsonObject=new JSONObject();
         String checkResult=checkJobDistribution(workerDistribution);
         ReviewPaper reviewPaper=reviewPaperService.getPaper(paperId);
@@ -50,7 +50,7 @@ public class ReviewJobService {
             return jsonObject;
         }
         if(jobId.equals("")) {
-            ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId,reviewPaper.getId(), startTime, endTime, "", isCrossValidation, validationNum);
+            ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId,reviewPaper.getId(), startTime, endTime, "", isCrossValidation, validationNum,maxWorker);
             jobId = jobDao.save(newReviewJob);
         }
         if(workerDistribution.equals("")){
@@ -152,7 +152,7 @@ public class ReviewJobService {
             for(int i=0;i<reports.size();i++){
                 reportIds.add(reports.get(i).getId());
             }
-            JSONObject jsonObject=uploadJob("",examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"",false,0);
+            JSONObject jsonObject=uploadJob("",examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"",false,0,0);
             // groupDao.save(new ReviewGroup("default","",workerList,jobId,reportIds));
             if(jsonObject.getString("status").equals("success")) {
                 messageVO.setStatus("200");
@@ -169,7 +169,7 @@ public class ReviewJobService {
         return messageVO;
     }
 
-    public JSONObject updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum){
+    public JSONObject updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum,int maxWorker){
         ReviewJob reviewJob=jobDao.findJob(jobId);
         reviewJob.setName(name);
         reviewJob.setDescription(description);
@@ -177,10 +177,11 @@ public class ReviewJobService {
         reviewJob.setEnd_time(endTime);
         reviewJob.setCrossValidation(isCrossValidation);
         reviewJob.setValidationNum(validationNum);
+        reviewJob.setMax_worker(maxWorker);
         jobDao.save(reviewJob);
         groupDao.removeByJob(jobId);
         reviewWorkerDao.removeByJob(jobId);
-        JSONObject jsonObject1=uploadJob(jobId,"","",name,description,paperId,startTime,endTime,workerList,workerDistribution,isCrossValidation,validationNum);
+        JSONObject jsonObject1=uploadJob(jobId,"","",name,description,paperId,startTime,endTime,workerList,workerDistribution,isCrossValidation,validationNum,maxWorker);
         return jsonObject1;
     }