chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
SjS 2025-04-12 18:09:19 +08:00
commit 53a27fae8a
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/domain/OrderDeviceVO.java
View File

@ -11,39 +11,38 @@ import lombok.Data;
@Data @Data
public class OrderDeviceVO extends OrderDevice{ public class OrderDeviceVO extends OrderDevice{
// 订单信息
@ApiModelProperty("订单编号") @ApiModelProperty("订单编号")
private String orderNo; private String orderNo;
@ApiModelProperty("设备剩余电量（%）")
private BigDecimal deviceRemainingPower;
@ApiModelProperty("设备锁状态")
private String deviceLockStatus;
@ApiModelProperty("订单用户ID") @ApiModelProperty("订单用户ID")
private Long orderUserId; private Long orderUserId;
@ApiModelProperty("订单用户名称") @ApiModelProperty("订单用户名称")
private String orderUserName; private String orderUserName;
@ApiModelProperty("商户名称")
private String deviceMchName;
@ApiModelProperty("订单开始时间") @ApiModelProperty("订单开始时间")
private LocalDateTime orderStartTime; private LocalDateTime orderStartTime;
@ApiModelProperty("订单结束时间") @ApiModelProperty("订单结束时间")
private LocalDateTime orderEndTime; private LocalDateTime orderEndTime;
@ApiModelProperty("订单最大可用时间") @ApiModelProperty("订单最大可用时间")
private LocalDateTime orderMaxTime; private LocalDateTime orderMaxTime;
@ApiModelProperty("订单运营区ID") @ApiModelProperty("订单运营区ID")
private Long orderAreaId; private Long orderAreaId;
@ApiModelProperty("运营区是否开启还车审核") @ApiModelProperty("运营区是否开启还车审核")
private Boolean orderAreaReturnVerify; private Boolean orderAreaReturnVerify;
// 设备信息
@ApiModelProperty("设备剩余电量（%）")
private BigDecimal deviceRemainingPower;
@ApiModelProperty("设备在线状态")
private String deviceOnlineStatus;
@ApiModelProperty("设备经度")
private BigDecimal deviceLongitude;
@ApiModelProperty("设备纬度")
private BigDecimal deviceLatitude;
@ApiModelProperty("设备锁状态")
private String deviceLockStatus;
@ApiModelProperty("设备商户名称")
private String deviceMchName;
// 设备剩余续航（公里） // 设备剩余续航（公里）
public BigDecimal getDeviceRemainEndurance() { public BigDecimal getDeviceRemainEndurance() {
BigDecimal remainEndurance = MathUtils.mulDecimal(getDeviceRemainingPower(), getDeviceModelFullEndurance()); BigDecimal remainEndurance = MathUtils.mulDecimal(getDeviceRemainingPower(), getDeviceModelFullEndurance());

3
ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/mapper/OrderDeviceMapper.xml
View File

@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bo.area_id as order_area_id, bo.area_id as order_area_id,
bd.remaining_power as device_remaining_power, bd.remaining_power as device_remaining_power,
bd.lock_status as device_lock_status, bd.lock_status as device_lock_status,
bd.online_status as device_online_status,
bd.longitude as device_longitude,
bd.latitude as device_latitude,
su.nick_name as order_user_name, su.nick_name as order_user_name,
mch.nick_name as device_mch_name mch.nick_name as device_mch_name
from bst_order_device bod from bst_order_device bod