From 81e1be286fecfc279731ced211d5315b4dfee00f Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 13 五月 2025 14:11:33 +0800
Subject: [PATCH] fix:修复
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index 4db3d37..e54c9f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -1,10 +1,12 @@
package com.ruoyi.web.controller.system;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import com.ruoyi.system.domain.DispatchOrd;
+import com.ruoyi.system.domain.TbOrders;
import com.ruoyi.system.domain.TbVehicleOrder;
+import com.ruoyi.system.service.IDispatchOrdService;
+import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.system.service.ITbVehicleOrderService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,12 @@
@Autowired
private ITbVehicleOrderService tbVehicleOrderService;
+ @Autowired
+ private IDispatchOrdService dispatchOrdService;
+
+ @Autowired
+ private ITbOrdersService tbOrdersService;
+
/**
* 鏌ヨ杞﹁締GPS鍧愭爣鍒楄〃
*/
@@ -72,7 +80,35 @@
if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
{
//闈�0琛ㄧず璁㈠崟瀹屾垚浜嗐��
- return getDataTable(new ArrayList<>());
+ try {
+ TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
+ if (tbOrders == null) {
+ return getDataTable(new ArrayList<>());
+ }
+
+
+ DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(tbOrders.getServiceOrdID());
+ if (dispatchOrd == null) {
+ return getDataTable(new ArrayList<>());
+ }
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("beginTime", dispatchOrd.getDispatchOrdStartDate());
+ params.put("endTime", dispatchOrd.getDispatchOrdUpdateTime());
+
+ vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
+ startPage();
+ // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+ vehicleGps.setOrderByColumn("collect_time");
+ vehicleGps.setIsAsc("desc");
+ List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
+ return getDataTable(list);
+ }
+ catch (Exception ex)
+ {
+ logger.error("宸插畬鎴愮殑璁㈠崟鏌ヨ鍦板浘寮傚父锛歿}",ex.getMessage());
+ return getDataTable(new ArrayList<>());
+ }
}
vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
--
Gitblit v1.9.1