瀏覽代碼

checkPaper的时候不checkImgUrl

MengyangDuan 5 年之前
父節點
當前提交
0c8b09144b

+ 3 - 6
src/main/java/edu/nju/controller/ReviewJobController.java

@@ -7,10 +7,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -57,7 +54,7 @@ public class ReviewJobController {
 
     @RequestMapping(value = "/uploadJob", method = RequestMethod.POST)
     @ResponseBody
-    public void uploadJob(String name, String description, String paperId,String startTime, String endTime,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, HttpServletResponse response){
         try {
             PrintWriter out = response.getWriter();
             String jobId = reviewJobService.uploadJob(name, description, paperId, startTime, endTime, workerList, workerDistribution);
@@ -80,7 +77,7 @@ 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,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, HttpServletResponse response){
         JSONObject result = new JSONObject();
         if(reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution)){
             result.put("status", "200");

+ 11 - 4
src/main/java/edu/nju/service/ReviewPaperService.java

@@ -191,12 +191,18 @@ public class ReviewPaperService {
 
     private String saveReport(JSONObject reportObject,String paper_id)throws Exception{
         try {
-            JSONArray imgArray=reportObject.getJSONArray("img_url");
+            JSONArray imgArray=new JSONArray();
+            if(reportObject.has("img_url")) {
+                imgArray = reportObject.getJSONArray("img_url");
+            }
             List<String> img_urls=new ArrayList<>();
             for(int i=0;i<imgArray.length();i++){
                 img_urls.add(String.valueOf(imgArray.get(i)));
             }
-            JSONArray fileArray=reportObject.getJSONArray("file_url");
+            JSONArray fileArray=new JSONArray();
+            if(reportObject.has("file_url")) {
+                fileArray = reportObject.getJSONArray("file_url");
+            }
             List<String> file_urls=new ArrayList<>();
             for(int i=0;i<fileArray.length();i++){
                 file_urls.add(String.valueOf(fileArray.get(i)));
@@ -277,8 +283,9 @@ public class ReviewPaperService {
                 String reportName=report.getString("name");
                 String originalId=report.getString("original_id");
                 String reportDescription=report.getString("description");
-                JSONArray imgUrls=report.getJSONArray("img_url");
-                JSONArray fileUrls=report.getJSONArray("file_url");
+//                JSONArray imgUrls=report.getJSONArray("img_url");
+//                JSONArray fileUrls=report.getJSONArray("file_url");
+
             }
 
             JSONArray itemGroupArray=jsonObject.getJSONArray("item_group_list");

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

@@ -33,6 +33,7 @@ public class ReviewService {
             String jobId=reviewWorker.getJob_id();
             String paperId=reviewWorker.getPaper_id();
             reviewAnswer=new ReviewAnswer(itemId,reportId,workerId,jobId,paperId);
+            answerDao.save(reviewAnswer);
         }
         return reviewAnswer;
     }