diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index ad9e494..dd11764 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -125,7 +125,7 @@
 //        }
 //        return null;
 //    }
-    public Map saveEvent(EventDto eventInfo, TaskDto taskInfo,
+    public Map saveEvent(EventDto eventInfo,Long taskId,
                          String[] fileNames, String[] fileBuffers)
     {
         Map map = new HashMap<String, Object>();
@@ -165,7 +165,7 @@
             event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude()));
             event.setCreateTime(eventInfo.getCreateTime().equalsIgnoreCase("")?null:DateUtils.sdf2.parse(eventInfo.getCreateTime()));
             event.setDescription(eventInfo.getDescription());
-            event.setTaskId(taskInfo.getId());
+            event.setTaskId(taskId);
             save(event);
             map.put("uploadFile", "上传成功!" + "图片路径为：" + toDir + "//" + fileName);
             return map;

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index ad9e494..dd11764 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -125,7 +125,7 @@
 //        }
 //        return null;
 //    }
-    public Map saveEvent(EventDto eventInfo, TaskDto taskInfo,
+    public Map saveEvent(EventDto eventInfo,Long taskId,
                          String[] fileNames, String[] fileBuffers)
     {
         Map map = new HashMap<String, Object>();
@@ -165,7 +165,7 @@
             event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude()));
             event.setCreateTime(eventInfo.getCreateTime().equalsIgnoreCase("")?null:DateUtils.sdf2.parse(eventInfo.getCreateTime()));
             event.setDescription(eventInfo.getDescription());
-            event.setTaskId(taskInfo.getId());
+            event.setTaskId(taskId);
             save(event);
             map.put("uploadFile", "上传成功!" + "图片路径为：" + toDir + "//" + fileName);
             return map;
diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 8333899..e6515d5 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -97,8 +97,17 @@
 
             Gson gson = new Gson();
             EventDto eventDto = gson.fromJson(eventInfo, EventDto.class);
-            TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim()));
-            Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers);
+//            TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim()));
+            Long taskIdValue = 0L;
+            try{
+                 taskIdValue = Long.valueOf(taskId);
+            }catch(NumberFormatException e){//传过来的任务ID无法转换为Long类型
+                result.put("success", false);
+                result.put("message", "请确认已经执行任务，或任务ID号正确！");
+                return result;
+
+           }
+            Map temp = eventManager.saveEvent(eventDto, taskIdValue, fileNames,fileBuffers);
             if (temp!=null)
             {
                 result.put("success", true);

diff --git a/src/main/java/com/casic/accessControl/event/manager/EventManager.java b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
index ad9e494..dd11764 100644
--- a/src/main/java/com/casic/accessControl/event/manager/EventManager.java
+++ b/src/main/java/com/casic/accessControl/event/manager/EventManager.java
@@ -125,7 +125,7 @@
 //        }
 //        return null;
 //    }
-    public Map saveEvent(EventDto eventInfo, TaskDto taskInfo,
+    public Map saveEvent(EventDto eventInfo,Long taskId,
                          String[] fileNames, String[] fileBuffers)
     {
         Map map = new HashMap<String, Object>();
@@ -165,7 +165,7 @@
             event.setLongitude(eventInfo.getLongitude()==null ? 0 : Double.valueOf(eventInfo.getLongitude()));
             event.setCreateTime(eventInfo.getCreateTime().equalsIgnoreCase("")?null:DateUtils.sdf2.parse(eventInfo.getCreateTime()));
             event.setDescription(eventInfo.getDescription());
-            event.setTaskId(taskInfo.getId());
+            event.setTaskId(taskId);
             save(event);
             map.put("uploadFile", "上传成功!" + "图片路径为：" + toDir + "//" + fileName);
             return map;
diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 8333899..e6515d5 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -97,8 +97,17 @@
 
             Gson gson = new Gson();
             EventDto eventDto = gson.fromJson(eventInfo, EventDto.class);
-            TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim()));
-            Map temp = eventManager.saveEvent(eventDto, taskDto, fileNames,fileBuffers);
+//            TaskDto taskDto = TaskDto.Convert(taskManager.getTaskById(taskId.trim()));
+            Long taskIdValue = 0L;
+            try{
+                 taskIdValue = Long.valueOf(taskId);
+            }catch(NumberFormatException e){//传过来的任务ID无法转换为Long类型
+                result.put("success", false);
+                result.put("message", "请确认已经执行任务，或任务ID号正确！");
+                return result;
+
+           }
+            Map temp = eventManager.saveEvent(eventDto, taskIdValue, fileNames,fileBuffers);
             if (temp!=null)
             {
                 result.put("success", true);
diff --git a/src/test/com/casic/accessControl/event/EventTest.java b/src/test/com/casic/accessControl/event/EventTest.java
index ac899c4..364fa16 100644
--- a/src/test/com/casic/accessControl/event/EventTest.java
+++ b/src/test/com/casic/accessControl/event/EventTest.java
@@ -1,10 +1,63 @@
 package com.casic.accessControl.event;
 
 import com.casic.accessControl.basic.BasicTest;
+import com.casic.accessControl.event.domain.Event;
+import com.casic.accessControl.event.dto.EventDto;
+import com.casic.accessControl.event.manager.EventManager;
+import com.casic.accessControl.util.DateUtils;
+import com.google.gson.Gson;
+import org.junit.Test;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by lenovo on 2016/8/31.
  */
 public class EventTest extends BasicTest{
+    @Resource
+    private EventManager eventManager;
+    @Test
+    public void saveEventTest(){
+        Long taskId = 4L;
+        EventDto eventDto = new EventDto();
+        eventDto.setImageName("ImageNameTest");
+        eventDto.setLatitude(Math.random() * 90.0);
+        eventDto.setLongitude(Math.random() * 180.0);
+        eventDto.setCreateTime(String.valueOf(new Date()));
+        eventDto.setDescription("this is a event test");
+        String [] fileNames = {""};
+        String [] fileBuffers={""};
+        Map<String,Object> res = eventManager.saveEvent(eventDto,taskId,fileNames,fileBuffers);
+        System.out.println(new Gson().toJson(res));
+
+
+    }
+
+    @Test
+    public void getEventsByTaskIdTest(){
+       Long taskId = 4L;
+      List<EventDto> eventDtoList =  eventManager.getEventsByTaskId(taskId);
+       String s = new Gson().toJson(eventDtoList);
+        System.out.println(s);
+
+    }
+    @Test
+    public void getEventByIdTest(){
+        Long eventId = 10L;
+        EventDto eventDto =  eventManager.getEventById(eventId);
+        String res = new Gson().toJson(eventDto);
+        System.out.println(res);
+    }
+
+    @Test
+    public void deleteEventByIdTest(){
+        Long eventId = 10L;
+        boolean res = eventManager.deleteEventById(eventId);
+         System.out.println(res);
+    }
+
 
 }