xujiawei 5 years ago
parent
commit
5fadc498f3

+ 1 - 1
src/main/java/edu/nju/dao/AnswerDao.java

@@ -15,7 +15,7 @@ public class AnswerDao {
     @Autowired
     private MongoOperations mongoOperations;
 
-    public List<Answer> findAnswersByItemWorker(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);

+ 5 - 6
src/main/java/edu/nju/dao/JobDao.java

@@ -15,12 +15,6 @@ public class JobDao {
     @Autowired
     private MongoOperations mongoOperations;
 
-    //save存在则更新,不存在则插入
-    public String save(Job job) {
-        mongoOperations.save(job);
-        return job.getId();
-    }
-
     //id查询,find查询所有
     public Job findJob(String id){
         Query query = new Query();
@@ -29,4 +23,9 @@ public class JobDao {
         if(list.size() == 0 || list == null) {return null;}
         return list.get(0);
     }
+
+    public String save(Job job) {
+        mongoOperations.save(job);
+        return job.getId();
+    }
 }

+ 0 - 2
src/main/java/edu/nju/dao/UserToItemDao.java

@@ -1,6 +1,5 @@
 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;
@@ -8,7 +7,6 @@ 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

+ 0 - 0
src/main/java/edu/nju/entities/Answer.java


+ 1 - 2
src/main/java/edu/nju/entities/Job.java

@@ -29,8 +29,7 @@ public class Job implements java.io.Serializable{
 
     private 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;
+    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) {
         this.description = description;
         this.name = name;
         this.create_time_millis = create_time_millis;

+ 1 - 1
src/main/java/edu/nju/service/ItemService.java

@@ -32,7 +32,7 @@ public class ItemService {
         return jobDao.findJob(job_id);
     }
 
-    public List<Answer>getAnswerByWorker(String item_id,String worker_id){
+    public List<Answer> getAnswerByWorker(String item_id, String worker_id){
         return answerDao.findAnswersByItemWorker(item_id, worker_id);
     }