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 e6515d5..5f84082 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,12 +2,19 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; +import com.casic.accessControl.task.domain.Task; +import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import com.google.gson.Gson; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -18,11 +25,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lenovo on 2016/8/11. @@ -36,6 +42,12 @@ @Resource private TaskManager taskManager; + @Resource + private TaskDetailManager taskDetailManager; + + @Resource + private MarkerManager markerManager; + @RequestMapping("get-event-list") @ResponseBody public Map getEventListByTaskId(@RequestParam(value = "taskId") Long taskId, HttpSession session) { @@ -127,4 +139,42 @@ } + @RequestMapping("uploadAppMarker") + @ResponseBody + public Map addAppMaskerTask(@RequestBody MarkerDto markerDto) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(markerDto.getTaskId()); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (markerDto.getIds().length() > 0) { + markerList = markerManager.getMarkerByIds(markerDto.getIds()); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + 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 e6515d5..5f84082 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,12 +2,19 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; +import com.casic.accessControl.task.domain.Task; +import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import com.google.gson.Gson; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -18,11 +25,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lenovo on 2016/8/11. @@ -36,6 +42,12 @@ @Resource private TaskManager taskManager; + @Resource + private TaskDetailManager taskDetailManager; + + @Resource + private MarkerManager markerManager; + @RequestMapping("get-event-list") @ResponseBody public Map getEventListByTaskId(@RequestParam(value = "taskId") Long taskId, HttpSession session) { @@ -127,4 +139,42 @@ } + @RequestMapping("uploadAppMarker") + @ResponseBody + public Map addAppMaskerTask(@RequestBody MarkerDto markerDto) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(markerDto.getTaskId()); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (markerDto.getIds().length() > 0) { + markerList = markerManager.getMarkerByIds(markerDto.getIds()); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; + } + } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 8ad3417..0b87366 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,7 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; @@ -10,29 +13,27 @@ import com.casic.accessControl.user.domain.User; import com.casic.accessControl.user.manager.RoleManager; import com.casic.accessControl.user.manager.UserManager; +import com.casic.accessControl.util.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** -* Created by admin on 2015/1/15. -*/ + * Created by admin on 2015/1/15. + */ @Component @Path("task") -public class TaskResource -{ +public class TaskResource { private static Logger logger = LoggerFactory.getLogger(TaskResource.class); @Resource @@ -47,10 +48,13 @@ @Resource private TaskDetailManager taskDetailManager; + @Resource + private MarkerManager markerManager; + @GET @Path("get") @Produces(MediaType.APPLICATION_JSON) - public Map get(@QueryParam("userName") String userName ){ + public Map get(@QueryParam("userName") String userName) { Map map = new HashMap(); try { @@ -63,58 +67,136 @@ } List tasks = taskManager.getTasksByPatroler(user); List taskInfos = TaskInfo.Converts(tasks); - if (taskInfos!=null) - { + if (taskInfos != null) { map.put("success", "true"); map.put("message", taskInfos); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("post") @Produces(MediaType.APPLICATION_JSON) - public Map post(@QueryParam("taskId") String taskId ){ + public Map post(@QueryParam("taskId") String taskId) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(2); task.setEndDate(new Date()); taskManager.save(task); map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; + } + + + /** + * app端新建任务接口 + * + * @param patrollerId + * @param description + * @return + */ + @GET + @Path("addAppTask") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppTask(@QueryParam("patrollerId") String patrollerId, + @QueryParam("description") String description) { + Map map = new HashMap(); + try { + Task task = new Task(); + User patroler = userManager.get(Long.parseLong(patrollerId)); + task.setCreator(patroler); + task.setPatroler(patroler); + task.setDeployDate(new Date()); + task.setCompany(patroler.getCompany()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String taskCode = sdf.format(new Date()); + task.setTaskCode(taskCode); + task.setDescription(description); + task.setStatus(1); + task.setIsValid(1); + task.setBeginDate(new Date()); + taskManager.save(task); + map.put("success", "true"); + map.put("taskId", task.getId()); + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + return map; + } + + + /** + * app端上传marker信息 + * + + * @return + */ + @GET + @Path("uploadAppMarker") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppMaskerTask(@QueryParam("taskId") String taskId, + @QueryParam("ids") String ids) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (ids.length() > 0) { + markerList = markerManager.getMarkerByIds(ids); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; } @GET @Path("update") @Produces(MediaType.APPLICATION_JSON) public Map updateTask(@QueryParam("taskId") String taskId, - @QueryParam("state") String state ){ + @QueryParam("state") String state) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(Integer.parseInt(state)); - if(state.trim().equals("1")){ + if (state.trim().equals("1")) { task.setBeginDate(new Date()); - }else if(state.trim().equals("2")){ + } else if (state.trim().equals("2")) { task.setEndDate(new Date()); } @@ -122,24 +204,21 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("update-task-mark") @Produces(MediaType.APPLICATION_JSON) - public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId ){ + public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId) { Map map = new HashMap(); try { TaskDetail taskDetail = taskDetailManager.get(Long.parseLong(taskDetailId)); - if (taskDetail!=null) - { + if (taskDetail != null) { taskDetail.setIsChecked(1); taskDetail.setFinishTime(new Date()); taskDetailManager.save(taskDetail); @@ -157,12 +236,10 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + 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 e6515d5..5f84082 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,12 +2,19 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; +import com.casic.accessControl.task.domain.Task; +import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import com.google.gson.Gson; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -18,11 +25,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lenovo on 2016/8/11. @@ -36,6 +42,12 @@ @Resource private TaskManager taskManager; + @Resource + private TaskDetailManager taskDetailManager; + + @Resource + private MarkerManager markerManager; + @RequestMapping("get-event-list") @ResponseBody public Map getEventListByTaskId(@RequestParam(value = "taskId") Long taskId, HttpSession session) { @@ -127,4 +139,42 @@ } + @RequestMapping("uploadAppMarker") + @ResponseBody + public Map addAppMaskerTask(@RequestBody MarkerDto markerDto) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(markerDto.getTaskId()); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (markerDto.getIds().length() > 0) { + markerList = markerManager.getMarkerByIds(markerDto.getIds()); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; + } + } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 8ad3417..0b87366 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,7 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; @@ -10,29 +13,27 @@ import com.casic.accessControl.user.domain.User; import com.casic.accessControl.user.manager.RoleManager; import com.casic.accessControl.user.manager.UserManager; +import com.casic.accessControl.util.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** -* Created by admin on 2015/1/15. -*/ + * Created by admin on 2015/1/15. + */ @Component @Path("task") -public class TaskResource -{ +public class TaskResource { private static Logger logger = LoggerFactory.getLogger(TaskResource.class); @Resource @@ -47,10 +48,13 @@ @Resource private TaskDetailManager taskDetailManager; + @Resource + private MarkerManager markerManager; + @GET @Path("get") @Produces(MediaType.APPLICATION_JSON) - public Map get(@QueryParam("userName") String userName ){ + public Map get(@QueryParam("userName") String userName) { Map map = new HashMap(); try { @@ -63,58 +67,136 @@ } List tasks = taskManager.getTasksByPatroler(user); List taskInfos = TaskInfo.Converts(tasks); - if (taskInfos!=null) - { + if (taskInfos != null) { map.put("success", "true"); map.put("message", taskInfos); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("post") @Produces(MediaType.APPLICATION_JSON) - public Map post(@QueryParam("taskId") String taskId ){ + public Map post(@QueryParam("taskId") String taskId) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(2); task.setEndDate(new Date()); taskManager.save(task); map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; + } + + + /** + * app端新建任务接口 + * + * @param patrollerId + * @param description + * @return + */ + @GET + @Path("addAppTask") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppTask(@QueryParam("patrollerId") String patrollerId, + @QueryParam("description") String description) { + Map map = new HashMap(); + try { + Task task = new Task(); + User patroler = userManager.get(Long.parseLong(patrollerId)); + task.setCreator(patroler); + task.setPatroler(patroler); + task.setDeployDate(new Date()); + task.setCompany(patroler.getCompany()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String taskCode = sdf.format(new Date()); + task.setTaskCode(taskCode); + task.setDescription(description); + task.setStatus(1); + task.setIsValid(1); + task.setBeginDate(new Date()); + taskManager.save(task); + map.put("success", "true"); + map.put("taskId", task.getId()); + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + return map; + } + + + /** + * app端上传marker信息 + * + + * @return + */ + @GET + @Path("uploadAppMarker") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppMaskerTask(@QueryParam("taskId") String taskId, + @QueryParam("ids") String ids) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (ids.length() > 0) { + markerList = markerManager.getMarkerByIds(ids); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; } @GET @Path("update") @Produces(MediaType.APPLICATION_JSON) public Map updateTask(@QueryParam("taskId") String taskId, - @QueryParam("state") String state ){ + @QueryParam("state") String state) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(Integer.parseInt(state)); - if(state.trim().equals("1")){ + if (state.trim().equals("1")) { task.setBeginDate(new Date()); - }else if(state.trim().equals("2")){ + } else if (state.trim().equals("2")) { task.setEndDate(new Date()); } @@ -122,24 +204,21 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("update-task-mark") @Produces(MediaType.APPLICATION_JSON) - public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId ){ + public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId) { Map map = new HashMap(); try { TaskDetail taskDetail = taskDetailManager.get(Long.parseLong(taskDetailId)); - if (taskDetail!=null) - { + if (taskDetail != null) { taskDetail.setIsChecked(1); taskDetail.setFinishTime(new Date()); taskDetailManager.save(taskDetail); @@ -157,12 +236,10 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } } diff --git a/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java new file mode 100644 index 0000000..16108fd --- /dev/null +++ b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java @@ -0,0 +1,26 @@ +package com.casic.accessControl.task.dto; + +public class MarkerDto { + + + private String taskId; + + private String ids; + + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } +} 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 e6515d5..5f84082 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,12 +2,19 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; +import com.casic.accessControl.task.domain.Task; +import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import com.google.gson.Gson; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -18,11 +25,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lenovo on 2016/8/11. @@ -36,6 +42,12 @@ @Resource private TaskManager taskManager; + @Resource + private TaskDetailManager taskDetailManager; + + @Resource + private MarkerManager markerManager; + @RequestMapping("get-event-list") @ResponseBody public Map getEventListByTaskId(@RequestParam(value = "taskId") Long taskId, HttpSession session) { @@ -127,4 +139,42 @@ } + @RequestMapping("uploadAppMarker") + @ResponseBody + public Map addAppMaskerTask(@RequestBody MarkerDto markerDto) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(markerDto.getTaskId()); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (markerDto.getIds().length() > 0) { + markerList = markerManager.getMarkerByIds(markerDto.getIds()); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; + } + } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 8ad3417..0b87366 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,7 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; @@ -10,29 +13,27 @@ import com.casic.accessControl.user.domain.User; import com.casic.accessControl.user.manager.RoleManager; import com.casic.accessControl.user.manager.UserManager; +import com.casic.accessControl.util.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** -* Created by admin on 2015/1/15. -*/ + * Created by admin on 2015/1/15. + */ @Component @Path("task") -public class TaskResource -{ +public class TaskResource { private static Logger logger = LoggerFactory.getLogger(TaskResource.class); @Resource @@ -47,10 +48,13 @@ @Resource private TaskDetailManager taskDetailManager; + @Resource + private MarkerManager markerManager; + @GET @Path("get") @Produces(MediaType.APPLICATION_JSON) - public Map get(@QueryParam("userName") String userName ){ + public Map get(@QueryParam("userName") String userName) { Map map = new HashMap(); try { @@ -63,58 +67,136 @@ } List tasks = taskManager.getTasksByPatroler(user); List taskInfos = TaskInfo.Converts(tasks); - if (taskInfos!=null) - { + if (taskInfos != null) { map.put("success", "true"); map.put("message", taskInfos); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("post") @Produces(MediaType.APPLICATION_JSON) - public Map post(@QueryParam("taskId") String taskId ){ + public Map post(@QueryParam("taskId") String taskId) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(2); task.setEndDate(new Date()); taskManager.save(task); map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; + } + + + /** + * app端新建任务接口 + * + * @param patrollerId + * @param description + * @return + */ + @GET + @Path("addAppTask") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppTask(@QueryParam("patrollerId") String patrollerId, + @QueryParam("description") String description) { + Map map = new HashMap(); + try { + Task task = new Task(); + User patroler = userManager.get(Long.parseLong(patrollerId)); + task.setCreator(patroler); + task.setPatroler(patroler); + task.setDeployDate(new Date()); + task.setCompany(patroler.getCompany()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String taskCode = sdf.format(new Date()); + task.setTaskCode(taskCode); + task.setDescription(description); + task.setStatus(1); + task.setIsValid(1); + task.setBeginDate(new Date()); + taskManager.save(task); + map.put("success", "true"); + map.put("taskId", task.getId()); + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + return map; + } + + + /** + * app端上传marker信息 + * + + * @return + */ + @GET + @Path("uploadAppMarker") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppMaskerTask(@QueryParam("taskId") String taskId, + @QueryParam("ids") String ids) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (ids.length() > 0) { + markerList = markerManager.getMarkerByIds(ids); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; } @GET @Path("update") @Produces(MediaType.APPLICATION_JSON) public Map updateTask(@QueryParam("taskId") String taskId, - @QueryParam("state") String state ){ + @QueryParam("state") String state) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(Integer.parseInt(state)); - if(state.trim().equals("1")){ + if (state.trim().equals("1")) { task.setBeginDate(new Date()); - }else if(state.trim().equals("2")){ + } else if (state.trim().equals("2")) { task.setEndDate(new Date()); } @@ -122,24 +204,21 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("update-task-mark") @Produces(MediaType.APPLICATION_JSON) - public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId ){ + public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId) { Map map = new HashMap(); try { TaskDetail taskDetail = taskDetailManager.get(Long.parseLong(taskDetailId)); - if (taskDetail!=null) - { + if (taskDetail != null) { taskDetail.setIsChecked(1); taskDetail.setFinishTime(new Date()); taskDetailManager.save(taskDetail); @@ -157,12 +236,10 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } } diff --git a/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java new file mode 100644 index 0000000..16108fd --- /dev/null +++ b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java @@ -0,0 +1,26 @@ +package com.casic.accessControl.task.dto; + +public class MarkerDto { + + + private String taskId; + + private String ids; + + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b7410d..1c66582 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,9 +16,9 @@ # db # ============================================================================ db.default.driverClassName=org.postgresql.Driver -db.default.url=jdbc:postgresql://127.0.0.1:11332/ems_tong +db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms db.default.username=postgres -db.default.password=casic203 +db.default.password=Casic203 #db.default.username=emsweb #db.default.password=emsweb #db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 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 e6515d5..5f84082 100644 --- a/src/main/java/com/casic/accessControl/event/web/EventController.java +++ b/src/main/java/com/casic/accessControl/event/web/EventController.java @@ -2,12 +2,19 @@ import com.casic.accessControl.event.dto.EventDto; import com.casic.accessControl.event.manager.EventManager; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; +import com.casic.accessControl.task.domain.Task; +import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; +import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; import com.casic.accessControl.user.domain.User; import com.casic.accessControl.util.StringUtils; import com.google.gson.Gson; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -18,11 +25,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lenovo on 2016/8/11. @@ -36,6 +42,12 @@ @Resource private TaskManager taskManager; + @Resource + private TaskDetailManager taskDetailManager; + + @Resource + private MarkerManager markerManager; + @RequestMapping("get-event-list") @ResponseBody public Map getEventListByTaskId(@RequestParam(value = "taskId") Long taskId, HttpSession session) { @@ -127,4 +139,42 @@ } + @RequestMapping("uploadAppMarker") + @ResponseBody + public Map addAppMaskerTask(@RequestBody MarkerDto markerDto) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(markerDto.getTaskId()); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (markerDto.getIds().length() > 0) { + markerList = markerManager.getMarkerByIds(markerDto.getIds()); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; + } + } diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java index 8ad3417..0b87366 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskResource.java +++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java @@ -1,7 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.domain.Marker; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import com.casic.accessControl.task.dto.MarkerDto; import com.casic.accessControl.task.dto.TaskDto; import com.casic.accessControl.task.manager.TaskDetailManager; import com.casic.accessControl.task.manager.TaskManager; @@ -10,29 +13,27 @@ import com.casic.accessControl.user.domain.User; import com.casic.accessControl.user.manager.RoleManager; import com.casic.accessControl.user.manager.UserManager; +import com.casic.accessControl.util.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** -* Created by admin on 2015/1/15. -*/ + * Created by admin on 2015/1/15. + */ @Component @Path("task") -public class TaskResource -{ +public class TaskResource { private static Logger logger = LoggerFactory.getLogger(TaskResource.class); @Resource @@ -47,10 +48,13 @@ @Resource private TaskDetailManager taskDetailManager; + @Resource + private MarkerManager markerManager; + @GET @Path("get") @Produces(MediaType.APPLICATION_JSON) - public Map get(@QueryParam("userName") String userName ){ + public Map get(@QueryParam("userName") String userName) { Map map = new HashMap(); try { @@ -63,58 +67,136 @@ } List tasks = taskManager.getTasksByPatroler(user); List taskInfos = TaskInfo.Converts(tasks); - if (taskInfos!=null) - { + if (taskInfos != null) { map.put("success", "true"); map.put("message", taskInfos); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("post") @Produces(MediaType.APPLICATION_JSON) - public Map post(@QueryParam("taskId") String taskId ){ + public Map post(@QueryParam("taskId") String taskId) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(2); task.setEndDate(new Date()); taskManager.save(task); map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; + } + + + /** + * app端新建任务接口 + * + * @param patrollerId + * @param description + * @return + */ + @GET + @Path("addAppTask") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppTask(@QueryParam("patrollerId") String patrollerId, + @QueryParam("description") String description) { + Map map = new HashMap(); + try { + Task task = new Task(); + User patroler = userManager.get(Long.parseLong(patrollerId)); + task.setCreator(patroler); + task.setPatroler(patroler); + task.setDeployDate(new Date()); + task.setCompany(patroler.getCompany()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String taskCode = sdf.format(new Date()); + task.setTaskCode(taskCode); + task.setDescription(description); + task.setStatus(1); + task.setIsValid(1); + task.setBeginDate(new Date()); + taskManager.save(task); + map.put("success", "true"); + map.put("taskId", task.getId()); + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + return map; + } + + + /** + * app端上传marker信息 + * + + * @return + */ + @GET + @Path("uploadAppMarker") + @Produces(MediaType.APPLICATION_JSON) + public Map addAppMaskerTask(@QueryParam("taskId") String taskId, + @QueryParam("ids") String ids) { + Map map = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = new ArrayList(); + List markerList = new ArrayList<>(); + + if (ids.length() > 0) { + markerList = markerManager.getMarkerByIds(ids); + for (Marker m : markerList) { + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); + taskDetail.setLatitude(m.getLatitude()); + taskDetail.setLongitude(m.getLongitude()); + taskDetail.setTask(task); + taskDetail.setIsNormal(1); + taskDetail.setIsChecked(1); + taskDetail.setFinishTime(new Date()); + taskDetails.add(taskDetail); + } + for (int i = 0; i < taskDetails.size(); i++) { + taskDetailManager.save(taskDetails.get(i)); + } + task.setEndDate(new Date()); + task.setStatus(2); + taskManager.save(task); + } + } catch (Exception e) { + map.put("success", "false"); + map.put("message", e.getMessage()); + } + map.put("success", "true"); + return map; } @GET @Path("update") @Produces(MediaType.APPLICATION_JSON) public Map updateTask(@QueryParam("taskId") String taskId, - @QueryParam("state") String state ){ + @QueryParam("state") String state) { Map map = new HashMap(); try { Task task = taskManager.get(Long.parseLong(taskId)); - if (task!=null) - { + if (task != null) { task.setStatus(Integer.parseInt(state)); - if(state.trim().equals("1")){ + if (state.trim().equals("1")) { task.setBeginDate(new Date()); - }else if(state.trim().equals("2")){ + } else if (state.trim().equals("2")) { task.setEndDate(new Date()); } @@ -122,24 +204,21 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } @GET @Path("update-task-mark") @Produces(MediaType.APPLICATION_JSON) - public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId ){ + public Map updateTaskDetail(@QueryParam("taskDetailId") String taskDetailId) { Map map = new HashMap(); try { TaskDetail taskDetail = taskDetailManager.get(Long.parseLong(taskDetailId)); - if (taskDetail!=null) - { + if (taskDetail != null) { taskDetail.setIsChecked(1); taskDetail.setFinishTime(new Date()); taskDetailManager.save(taskDetail); @@ -157,12 +236,10 @@ map.put("success", "true"); map.put("message", ""); } - } - catch (Exception e) - { + } catch (Exception e) { map.put("success", "false"); map.put("message", e.getMessage()); } - return map; + return map; } } diff --git a/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java new file mode 100644 index 0000000..16108fd --- /dev/null +++ b/src/main/java/com/casic/accessControl/task/dto/MarkerDto.java @@ -0,0 +1,26 @@ +package com.casic.accessControl.task.dto; + +public class MarkerDto { + + + private String taskId; + + private String ids; + + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b7410d..1c66582 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,9 +16,9 @@ # db # ============================================================================ db.default.driverClassName=org.postgresql.Driver -db.default.url=jdbc:postgresql://127.0.0.1:11332/ems_tong +db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms db.default.username=postgres -db.default.password=casic203 +db.default.password=Casic203 #db.default.username=emsweb #db.default.password=emsweb #db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 diff --git a/src/main/resources/spring/applicationContext-filter.xml b/src/main/resources/spring/applicationContext-filter.xml index 98ac7d6..cd14741 100644 --- a/src/main/resources/spring/applicationContext-filter.xml +++ b/src/main/resources/spring/applicationContext-filter.xml @@ -38,6 +38,7 @@ /marker/batch-save-no-update.do /marker/save-marker-photo.do /event/save-event.do + /event/uploadAppMarker.do /task/get-task.do /app/get-latest-version.do /xls/*