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

# Conflicts:
#	src/main/java/edu/nju/entities/Answer.java
#	src/main/java/edu/nju/entities/Job.java

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

@@ -71,6 +71,67 @@ public class ItemController {
         }
     }
 
+    @RequestMapping(value = "/getItemsByWorker")
+    @ResponseBody
+    public void getItemListByWorkerJob(String job_id, String worker_id, HttpServletResponse response){
+        try {
+            PrintWriter out = response.getWriter();
+            List<Item> items = iservice.getItemsByWorkerJob(worker_id, job_id);
+            out.print(new JSONArray(items));
+            out.flush();
+            out.close();
+        }catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+    }
+
+    @RequestMapping(value = "/saveAnswer")
+    @ResponseBody
+    public void saveAnswer(String item_id, String worker_id,List<String>answers,String attachment_location, HttpServletResponse response){
+        JSONObject result = new JSONObject();
+        String id = iservice.saveAnswer(item_id, worker_id, answers, attachment_location);
+        if(id.equals("")) {
+            result.put("status", "200");
+            result.put("id", id);
+        }
+        else {
+            result.put("status", "500");
+        }
+        try {
+            PrintWriter out = response.getWriter();
+            out.print(result);
+            out.flush();
+            out.close();
+        }catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    @RequestMapping(value = "/updateAnswer")
+    @ResponseBody
+    public void saveAnswer(String id, String item_id, String worker_id,List<String>answers,String attachment_location, HttpServletResponse response){
+        JSONObject result = new JSONObject();
+        if(iservice.updateAnswer(id, item_id, worker_id, answers, attachment_location)){
+            result.put("status", "200");
+        } else {
+            result.put("status", "500");
+        }
+        try {
+            PrintWriter out = response.getWriter();
+            out.print(result);
+            out.flush();
+            out.close();
+        }catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+
+
     
 
 }

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

@@ -15,12 +15,13 @@ public class AnswerDao {
     @Autowired
     private MongoOperations mongoOperations;
 
-    public List<Answer> findAnswersByItenWorker(String item_id,String worker_id){
+    public List<Answer> findAnswersByItemWorker(String item_id,String worker_id){
         Query query = new Query();
         query.addCriteria(Criteria.where("item_id").is(item_id).and("worker_id").is(worker_id));
         return mongoOperations.find(query, Answer.class);
     }
 
+    //存在则更新，不存在则插入
     public String save(Answer answer){
         mongoOperations.save(answer);
         return answer.getId();

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

@@ -1,7 +1,6 @@
 package edu.nju.dao;
 
 import edu.nju.entities.Item;
-import edu.nju.entities.Job;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -29,6 +28,14 @@ public class ItemDao {
         return mongoOperations.find(query, Item.class);
     }
 
+    public Item getItem(String id){
+        Query query = new Query();
+        query.addCriteria(Criteria.where("_id").is(id));
+        List<Item> list = mongoOperations.find(query, Item.class);
+        if(list.size() == 0 || list == null) {return null;}
+        return list.get(0);
+    }
+
 
 
 

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

@@ -0,0 +1,27 @@
+package edu.nju.dao;
+
+import edu.nju.entities.Answer;
+import edu.nju.entities.UserToItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository
+public class UserToItemDao {
+
+    @Autowired
+    private MongoOperations mongoOperations;
+
+    public List<String>getItemsByUserJob(String worker_id,String job_id){
+        Query query = new Query();
+        query.addCriteria(Criteria.where("worker_id").is(worker_id).and("job_id").is(job_id));
+        List<UserToItem>list = mongoOperations.find(query, UserToItem.class);
+        if(list.size() == 0 || list == null) {return null;}
+        return list.get(0).getItem_id();
+    }
+}

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

@@ -20,14 +20,13 @@ public class Answer implements java.io.Serializable{
 
     private String worker_id;
 
-    private String job_id;
+    private String attachment_location;
 
-    public Answer(String id, String item_id, List<String> answers, String worker_id, String job_id) {
-        this.id = id;
+    public Answer(String item_id, List<String> answers, String worker_id, String attachment_location) {
         this.item_id = item_id;
         this.answers = answers;
         this.worker_id = worker_id;
-        this.job_id = job_id;
+        this.attachment_location = attachment_location;
     }
 
 
@@ -63,13 +62,14 @@ public class Answer implements java.io.Serializable{
         this.worker_id = worker_id;
     }
 
-    public String getJob_id() {
-        return job_id;
+    public String getAttachment_location() {
+        return attachment_location;
     }
 
-    public void setJob_id(String job_id) {
-        this.job_id = job_id;
+    public void setAttachment_location(String attachment_location) {
+        this.attachment_location = attachment_location;
     }
 
 
+
 }

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

@@ -29,7 +29,8 @@ public class Job implements java.io.Serializable{
 
     private String log_location;
 
-    public Job(String description, String name, String create_time_millis, String device_model, String device_brand, String device_os, String script_location, String report_location, String log_location) {
+    public Job(String id, String description, String name, String create_time_millis, String device_model, String device_brand, String device_os, String script_location, String report_location, String log_location) {
+        this.id = id;
         this.description = description;
         this.name = name;
         this.create_time_millis = create_time_millis;
@@ -53,8 +54,8 @@ public class Job implements java.io.Serializable{
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
+    public void setDescription(String desciption) {
+        this.description = desciption;
     }
 
     public String getName() {

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

@@ -0,0 +1,60 @@
+package edu.nju.entities;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.List;
+
+@Document
+public class UserToItem implements java.io.Serializable{
+
+    private static final long serialVersionUID = -5082515228801224799L;
+
+    @Id
+    private String id;
+
+    private String worker_id;
+
+    private List<String> item_id;
+
+    private String job_id;
+
+    public UserToItem(String id, String worker_id, List<String> item_id, String job_id) {
+        this.id = id;
+        this.item_id = item_id;
+        this.worker_id = worker_id;
+        this.job_id = job_id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<String> getItem_id() {
+        return item_id;
+    }
+
+    public void setItem_id(List<String> item_id) {
+        this.item_id = item_id;
+    }
+
+    public String getWorker_id() {
+        return worker_id;
+    }
+
+    public void setWorker_id(String worker_id) {
+        this.worker_id = worker_id;
+    }
+
+    public String getJob_id() {
+        return job_id;
+    }
+
+    public void setJob_id(String job_id) {
+        this.job_id = job_id;
+    }
+}

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

@@ -3,12 +3,14 @@ package edu.nju.service;
 import edu.nju.dao.AnswerDao;
 import edu.nju.dao.ItemDao;
 import edu.nju.dao.JobDao;
+import edu.nju.dao.UserToItemDao;
 import edu.nju.entities.Answer;
 import edu.nju.entities.Item;
 import edu.nju.entities.Job;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -19,6 +21,8 @@ public class ItemService {
     JobDao jobDao;
     @Autowired
     AnswerDao answerDao;
+    @Autowired
+    UserToItemDao userToItemDao;
 
     public List<Item>getJobItems(String job_id){
         return itemDao.findItemsByJob(job_id);
@@ -29,11 +33,38 @@ public class ItemService {
     }
 
     public List<Answer>getAnswerByWorker(String item_id,String worker_id){
-        return answerDao.findAnswersByItenWorker(item_id, worker_id);
+        return answerDao.findAnswersByItemWorker(item_id, worker_id);
     }
 
-    public String saveAnswer(Answer answer){
+    public String saveAnswer(String item_id, String worker_id,List<String>answers,String attachment_location){
+        Answer answer=new Answer(item_id,answers,worker_id,attachment_location);
         return answerDao.save(answer);
     }
 
+    public boolean updateAnswer(String id, String item_id, String worker_id,List<String>answers,String attachment_location){
+        try {
+            if(id == null || id.equals("undefined")) { return false; }
+            Answer answer=new Answer(item_id,answers,worker_id,attachment_location);
+            answer.setId(id);
+            answerDao.save(answer);
+            return true;
+        } catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<Item>getItemsByWorkerJob(String worker_id,String job_id){
+        List<String>itemIds = userToItemDao.getItemsByUserJob(worker_id, job_id);
+        List<Item>items=new ArrayList<>();
+        if(itemIds==null||itemIds.size()==0){
+            return null;
+        }else{
+            for(int i=0;i<itemIds.size();i++){
+                items.add(itemDao.getItem(itemIds.get(i)));
+            }
+        }
+        return items;
+    }
+
 }