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

debug

Browse Source
This commit is contained in:
磷叶 2025-04-30 11:09:34 +08:00
parent 9d1459b1bd
commit 06c3157d6b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
View File

@ -373,8 +373,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bd.longitude, bd.longitude,
bd.latitude, bd.latitude,
bod.status as order_device_status, bod.status as order_device_status,
bod.order_id bod.order_id,
bm.full_voltage as model_full_voltage,
bm.low_voltage as model_low_voltage,
bm.full_endurance as model_full_endurance
from bst_device bd from bst_device bd
left join bst_model bm on bm.id = bd.model_id
left join bst_order_device bod on bod.id = bd.order_device_id left join bst_order_device bod on bod.id = bd.order_device_id
<where> <where>
<include refid="searchCondition"/> <include refid="searchCondition"/>

3
ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java
View File

@ -127,7 +127,8 @@ public class OrderUtil {
BigDecimal deviceLat = device.getLatitude(); BigDecimal deviceLat = device.getLatitude();
// 停车区数量 // 停车区数量
vo.setParkingCount(parkingList.size()); int parkingCount = parkingList == null ? 0 : parkingList.size();
vo.setParkingCount(parkingCount);
// 通过设备定位获取所在停车点 // 通过设备定位获取所在停车点
AreaSubVO deviceAreaSub = AreaSubUtil.getInAreaSub(parkingList, deviceLon, deviceLat, areaError); AreaSubVO deviceAreaSub = AreaSubUtil.getInAreaSub(parkingList, deviceLon, deviceLat, areaError);