Browse Source

轨迹get请求

yuejiaying 4 years ago
parent
commit
3839ff667d

+ 3 - 3
operation_manager/src/main/java/com/huaxu/track/controller/TaskTrackController.java

@@ -35,7 +35,7 @@ public class TaskTrackController {
      * @param
      * @return Response对象
      */
-    @RequestMapping(value = "startTrack", method = RequestMethod.POST)
+    @RequestMapping(value = "startTrack", method = RequestMethod.GET)
     @ApiOperation(value = "开始轨迹")
     public AjaxMessage<Integer> startTrack(@ApiParam(value = "任务id", required = true) @RequestParam Integer taskId) {
         TaskTrack taskTrack=new TaskTrack();
@@ -59,7 +59,7 @@ public class TaskTrackController {
      * @param
      * @return Response对象
      */
-    @RequestMapping(value = "endTrack", method = RequestMethod.POST)
+    @RequestMapping(value = "endTrack", method = RequestMethod.GET)
     @ApiOperation(value = "结束轨迹")
     public AjaxMessage<Boolean> endTrack( @ApiParam(value = "任务id", required = true) @RequestParam Integer taskId) {
         TaskTrack taskTrack=new TaskTrack();
@@ -78,7 +78,7 @@ public class TaskTrackController {
      * @param
      * @return Response对象
      */
-    @RequestMapping(value = "selectTaskTrack", method = RequestMethod.POST)
+    @RequestMapping(value = "selectTaskTrack", method = RequestMethod.GET)
     @ApiOperation(value = "查询任务轨迹")
     public AjaxMessage<List<GpsDataHis>> selectTaskTrack(
             @ApiParam(value = "任务id", required = true) @RequestParam Integer taskId,

+ 1 - 1
operation_manager/src/main/java/com/huaxu/track/service/GpsDataHisService.java

@@ -37,7 +37,7 @@ public class GpsDataHisService extends ServiceImpl<GpsDataHisMapper, GpsDataHis>
      * @return
      */
     public List<GpsDataHis> selectGpsDataHis(TaskTrack taskTrack) {
-        return this.list(new QueryWrapper<GpsDataHis>().eq("USER_ID",taskTrack.getUserId())
+        return taskTrack==null?null:this.list(new QueryWrapper<GpsDataHis>().eq("USER_ID",taskTrack.getUserId())
                 .gt("UPLOAD_DATE",taskTrack.getTaskStartDate())
                 .lt("UPLOAD_DATE",taskTrack.getTaskEndDate()));
     }