提交 9861c8fc authored 作者: 艾庆国's avatar 艾庆国

Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

# Conflicts: # performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
package com.clx.performance.controller.temp; package com.clx.performance.controller.temp;
import com.clx.performance.dto.gd.GdRouteDTO;
import com.clx.performance.param.temp.DriverTraceAddParam; import com.clx.performance.param.temp.DriverTraceAddParam;
import com.clx.performance.param.temp.TruckTraceAddParam; import com.clx.performance.param.temp.TruckTraceAddParam;
import com.clx.performance.service.trace.TruckTraceService; import com.clx.performance.service.trace.TruckTraceService;
import com.clx.performance.utils.gd.GdService;
import com.clx.performance.vo.pc.trace.DriverTraceVO; import com.clx.performance.vo.pc.trace.DriverTraceVO;
import com.clx.performance.vo.pc.trace.DriverTruckTraceVO; import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
import com.msl.common.result.Result; import com.msl.common.result.Result;
...@@ -32,6 +34,9 @@ public class TempTraceController { ...@@ -32,6 +34,9 @@ public class TempTraceController {
@Autowired @Autowired
private TruckTraceService truckTraceService; private TruckTraceService truckTraceService;
@Autowired
private GdService gdService;
@ApiOperation(value = "车辆轨迹同步", notes = "<br>By:艾庆国") @ApiOperation(value = "车辆轨迹同步", notes = "<br>By:艾庆国")
@PostMapping("/truckTraceSync") @PostMapping("/truckTraceSync")
public Result truckTraceSync(@RequestBody TruckTraceAddParam param) { public Result truckTraceSync(@RequestBody TruckTraceAddParam param) {
...@@ -71,4 +76,15 @@ public class TempTraceController { ...@@ -71,4 +76,15 @@ public class TempTraceController {
return Result.ok(truckTraceService.getCurrentTruckPosition(truckNo)); return Result.ok(truckTraceService.getCurrentTruckPosition(truckNo));
} }
@ApiOperation(value = "线路规划", notes = "<br>By:艾庆国")
@PostMapping("/listDriverTraceByTime")
public Result<List<GdRouteDTO>> route(BigDecimal originLongitude, BigDecimal originLatitude,
BigDecimal destinationLongitude, BigDecimal destinationLatitude) {
List<GdRouteDTO> gdRouteDTOS = gdService.getRoute(originLongitude, originLatitude, destinationLongitude, destinationLatitude);
return Result.ok(gdRouteDTOS);
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论