lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

localizer
lzq 2025-09-29 19:32:43 +08:00
parent bfd77821fd
commit 89b1679992
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/TruckLocationTrackService.java
View File

@ -389,7 +389,7 @@ public class TruckLocationTrackService extends ServiceImpl<TruckLocationTrackMap
List<SseEmitter> emitterList = emitters.get(gpsId); List<SseEmitter> emitterList = emitters.get(gpsId);
lock.unlock(); lock.unlock();
if (CollUtil.isEmpty(emitterList)) { if (CollUtil.isEmpty(emitterList)) {
log.info("未找到订单 {} 的实时数据订阅者", gpsId); log.info("未找到GPS {} 的实时数据订阅者", gpsId);
return; return;
} }

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -399,6 +399,8 @@ public class OrderPagingResult {
* 车牌号 * 车牌号
*/ */
private String licensePlate; private String licensePlate;
private List<String> truckLicenseDate;
private List<String> truckQualificationDate;
/** /**
* 车辆类型 * 车辆类型
*/ */
@ -440,6 +442,8 @@ public class OrderPagingResult {
* 驾驶证编号 * 驾驶证编号
*/ */
private String drivingLicenceNo; private String drivingLicenceNo;
private LocalDate driverLicenceStartTime;
private LocalDate driverLicenceEndTime;
/** /**
* 手机号 * 手机号
*/ */

10
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -123,7 +123,13 @@
a.contacts, a.contacts,
a.phone, a.phone,
a.expect_time, a.expect_time,
a.estimated_quantity a.estimated_quantity,
e.truck_license_date,
e.qualification_date truck_qualification_date,
f.licence_start_time driver_licence_start_time,
f.licence_end_time driver_licence_end_time,
j.license_start_time trans_license_start_time,
j.license_end_time trans_license_start_time
FROM order_info a FROM order_info a
LEFT JOIN order_cargo_place b ON b.id = a.cargo_place_id LEFT JOIN order_cargo_place b ON b.id = a.cargo_place_id
LEFT JOIN order_goods c ON c.id = a.goods_id LEFT JOIN order_goods c ON c.id = a.goods_id
@ -152,6 +158,8 @@
</update> </update>
<resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult"> <resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
<result property="truckLicenseDate" column="truck_license_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
<result property="truckQualificationDate" column="truck_qualification_date" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
<result property="cargoPhoto" column="cargo_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/> <result property="cargoPhoto" column="cargo_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
<result property="checkPhoto" column="check_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/> <result property="checkPhoto" column="check_photo" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
<result property="sitePhotos" column="site_photos" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/> <result property="sitePhotos" column="site_photos" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>