diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java index 5f4c84a8..5b70265b 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqEbikeDispatchRecordDto.java @@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Id; import lombok.Data; import java.io.Serial; +import java.math.BigDecimal; @Data public class ReqEbikeDispatchRecordDto { @@ -20,4 +21,14 @@ public class ReqEbikeDispatchRecordDto { @Column(onInsertValue = "0") private String dispatchState; + /** + * 调度前车辆经度 + */ + private Double startVehicleLng; + + /** + * 调度前车辆纬度 + */ + private Double startVehicleLat; + } \ No newline at end of file diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java index 48b849eb..accae7a4 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeDispatchRecords.java @@ -90,22 +90,22 @@ public class EbikeDispatchRecords implements Serializable { /** * 调度前车辆纬度 */ - private BigDecimal startVehicleLat; + private Double startVehicleLat; /** * 调度前车辆经度 */ - private BigDecimal startVehicleLng; + private Double startVehicleLng; /** * 调度后车辆纬度 */ - private BigDecimal endVehicleLat; + private Double endVehicleLat; /** * 调度后车辆经度 */ - private BigDecimal endVehicleLng; + private Double endVehicleLng; /** * 创建时间,表示记录创建的时间 diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index f9108df2..600d5a2f 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -1162,6 +1162,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl records = new ArrayList<>(); for (String bikeCode : eqWorkOrderDispatchDto.getBikeCodes()) { EbikeDispatchRecords dispatchRecord = new EbikeDispatchRecords(); + //获取经纬度 + ResEbikeBikeAndEcuCodeDto bikeINfoData = getBikeINfoData(bikeCode); + ResGPSDto resGPSDto = bikeINfoData.getResGPSDto(); + if(resGPSDto!=null){ + Double latitude = resGPSDto.getLatitude(); + Double longitude = resGPSDto.getLongitude(); + dispatchRecord.setStartVehicleLng(latitude); + dispatchRecord.setStartVehicleLat(longitude); + } dispatchRecord.setOrderId(ebikeBikeOrder.getOrderId()); dispatchRecord.setBikeCode(bikeCode); - dispatchRecord.setStartStation(eqWorkOrderDispatchDto.getSiteId()); + dispatchRecord.setStartStationId(eqWorkOrderDispatchDto.getSiteId()); records.add(dispatchRecord); } // 批量插入调度记录(如果支持批量插入的话) @@ -1210,7 +1221,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl