Browse Source

reviewJob添加是否交叉认证和交叉认证人数接口

MengyangDuan 5 years ago
parent
commit
61fc314177

+ 4 - 4
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, 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, HttpServletResponse response){
         try {
             PrintWriter out = response.getWriter();
-            JSONObject jsonObject = reviewJobService.uploadJob("","",name, description, paperId, startTime, endTime, workerList, workerDistribution);
+            JSONObject jsonObject = reviewJobService.uploadJob("","",name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum);
             out.print(jsonObject);
             out.flush();
             out.close();
@@ -92,9 +92,9 @@ 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, HttpServletResponse response){
+    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 = new JSONObject();
-        if(reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution)){
+        if(reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution,isCrossValidation,validationNum)){
             result.put("status", "200");
         } else {
             result.put("status", "500");

+ 21 - 21
src/main/java/edu/nju/entities/ReviewJob.java

@@ -28,12 +28,12 @@ public class ReviewJob implements java.io.Serializable{
 
     private String group;
 
-//    private boolean isCrossValidation;
-//
-//    private int validationNum;
+    private boolean isCrossValidation;
+
+    private int validationNum;
 
     @PersistenceConstructor
-    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id, String start_time, String end_time, String group) {
+    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id, String start_time, String end_time, String group,boolean isCrossValidation,int validationNum) {
         this.exam_id=exam_id;
         this.case_id=case_id;
         this.description = description;
@@ -43,8 +43,8 @@ public class ReviewJob implements java.io.Serializable{
         this.start_time = start_time;
         this.end_time = end_time;
         this.group = group;
-//        this.isCrossValidation=isCrossValidation;
-//        this.validationNum=validationNum;
+        this.isCrossValidation=isCrossValidation;
+        this.validationNum=validationNum;
     }
     @PersistenceConstructor
     public ReviewJob(String exam_id, String paper_id,String create_time) {
@@ -130,19 +130,19 @@ public class ReviewJob implements java.io.Serializable{
         this.group = group;
     }
 
-//    public boolean isCrossValidation() {
-//        return isCrossValidation;
-//    }
-//
-//    public void setCrossValidation(boolean crossValidation) {
-//        isCrossValidation = crossValidation;
-//    }
-//
-//    public int getValidationNum() {
-//        return validationNum;
-//    }
-//
-//    public void setValidationNum(int validationNum) {
-//        this.validationNum = validationNum;
-//    }
+    public boolean isCrossValidation() {
+        return isCrossValidation;
+    }
+
+    public void setCrossValidation(boolean crossValidation) {
+        isCrossValidation = crossValidation;
+    }
+
+    public int getValidationNum() {
+        return validationNum;
+    }
+
+    public void setValidationNum(int validationNum) {
+        this.validationNum = validationNum;
+    }
 }

+ 1 - 0
src/main/java/edu/nju/service/ReviewAnalyzeService.java

@@ -17,6 +17,7 @@ import java.util.Map;
 
 @Service
 public class ReviewAnalyzeService {
+
     @Autowired
     ReviewAnswerDao reviewAnswerDao;
     @Autowired

+ 6 - 4
src/main/java/edu/nju/service/ReviewJobService.java

@@ -40,14 +40,14 @@ public class ReviewJobService {
         return jobDao.findJobs();
     }
 
-    public JSONObject uploadJob(String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution){
+    public JSONObject uploadJob(String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,boolean isCrossValidation,int validationNum){
         JSONObject jsonObject=new JSONObject();
         String checkResult=checkJobDistribution(workerDistribution);
         if(!checkResult.equals("success")){
             jsonObject.put("status","fail");
             jsonObject.put("message",checkResult);
         }
-        ReviewJob reviewJob=new ReviewJob(examId,caseId,name,description,Long.toString(System.currentTimeMillis()),paperId,startTime,endTime,"");
+        ReviewJob reviewJob=new ReviewJob(examId,caseId,name,description,Long.toString(System.currentTimeMillis()),paperId,startTime,endTime,"",isCrossValidation,validationNum);
         String jobId=jobDao.save(reviewJob);
         if(workerDistribution.equals("")){
             List<String>workerIds=new ArrayList<>();
@@ -134,7 +134,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,"");
+            JSONObject jsonObject=uploadJob(examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"",false,0);
            // groupDao.save(new ReviewGroup("default","",workerList,jobId,reportIds));
             if(jsonObject.getString("status").equals("success")) {
                 messageVO.setStatus("200");
@@ -151,13 +151,15 @@ public class ReviewJobService {
         return messageVO;
     }
 
-    public boolean updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution){
+    public boolean updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution,boolean isCrossValidation,int validationNum){
         try {
             ReviewJob reviewJob=jobDao.findJob(jobId);
             reviewJob.setName(name);
             reviewJob.setDescription(description);
             reviewJob.setStart_time(startTime);
             reviewJob.setEnd_time(endTime);
+            reviewJob.setCrossValidation(isCrossValidation);
+            reviewJob.setValidationNum(validationNum);
             jobDao.save(reviewJob);
             deleteJob(jobId);
             List<String>workerIds=new ArrayList<>();