diff --git a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java index 95bb00a..54d82c5 100644 --- a/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java +++ b/ebike-common/src/main/java/com/cdzy/common/model/dto/ResGPSDto.java @@ -36,11 +36,6 @@ public class ResGPSDto { */ private Integer gsm; - /** - * 时间戳 - */ - private Number timestamp; - /** * 0: 头盔不在位 1: 头盔在位 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java index 884dea6..6767e62 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java @@ -36,7 +36,6 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private Long bikeInfoId; - /** * 定位 */ @@ -51,6 +50,11 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private Integer usageStatus; + /** + * 最新骑行时间 + */ + private LocalDateTime latestCyclingTime; + /** * 外接电池电量(该值由控制器提供,若控制器不支持此值为0) */ @@ -66,11 +70,6 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private Integer gsm; - /** - * 时间戳 - */ - private Number timestamp; - /** * 0: 头盔不在位 1: 头盔在位 */ @@ -86,11 +85,6 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private Character isWheelSpin; - /** - * 0:撤防状态 1:设防状态 - */ - private Character isDefendOn; - /** * 0: 车辆静止 1: 车辆移动(运动状态 */ @@ -126,24 +120,9 @@ public class EbikeOrderBikeInfoDto implements Serializable { */ private String ecuSn; - /** - * 是否在运营区(记录最后一次用户停车 - */ - private Boolean inOperation; - - /** - * 是否在停车区(记录最后一次用户停车 - */ - private Boolean inParking; - /** * 最后一次上报时间 */ private LocalDateTime latestTime; - /** - * 放电状态:0-关闭(断电) 1-打开(通电) - */ - private Integer mosState; - } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java index 15dd945..7364ff2 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java @@ -14,8 +14,11 @@ import com.cdzy.operations.model.vo.EbikeBatteryClaimReturnVo; import com.cdzy.operations.model.vo.FaultOrderVo; import com.cdzy.operations.model.vo.InspectionSwapOrderVo; import com.cdzy.operations.service.EbikeBikeOrderService; +import com.cdzy.operations.utils.GeoCodingUtil; import com.cdzy.operations.utils.MinioUtil; import com.cdzy.operations.utils.RedisUtil; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; @@ -78,6 +81,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl