From 2f66c1634aad641ae396b8ae9ed64c0377968e08 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 12 五月 2025 18:11:39 +0800
Subject: [PATCH] fix:修复地图展示，通过订单号来获取车牌号
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 998237f..4db3d37 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,7 +1,11 @@
package com.ruoyi.web.controller.system;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+import com.ruoyi.system.domain.TbVehicleOrder;
+import com.ruoyi.system.service.ITbVehicleOrderService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,20 +35,51 @@
public class VehicleGpsController extends BaseController {
@Autowired
private IVehicleGpsService vehicleGpsService;
+
+ @Autowired
+ private ITbVehicleOrderService tbVehicleOrderService;
+
/**
* 鏌ヨ杞﹁締GPS鍧愭爣鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:gps:list')")
@GetMapping("/list")
public TableDataInfo list(VehicleGps vehicleGps) {
+
startPage();
+ // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+ vehicleGps.setOrderByColumn("collect_time");
+ vehicleGps.setIsAsc("desc");
List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
return getDataTable(list);
}
@Anonymous(needSign=true)
@GetMapping("/anonymousList")
public TableDataInfo anonymousList(VehicleGps vehicleGps) {
+
+ if(vehicleGps.getOrderId()==null)
+ {
+ return getDataTable(new ArrayList<>());
+ }
+
+ //鏌ヨ璁㈠崟
+ TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(vehicleGps.getOrderId());
+ if(tbVehicleOrder==null)
+ {
+ return getDataTable(new ArrayList<>());
+ }
+
+ if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
+ {
+ //闈�0琛ㄧず璁㈠崟瀹屾垚浜嗐��
+ return getDataTable(new ArrayList<>());
+ }
+
+ vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
startPage();
+ // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+ vehicleGps.setOrderByColumn("collect_time");
+ vehicleGps.setIsAsc("desc");
List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
return getDataTable(list);
}
@@ -56,6 +91,9 @@
@Log(title = "杞﹁締GPS鍧愭爣", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(VehicleGps vehicleGps) {
+ // 璁剧疆鎸夋椂闂村�掑簭鎺掑簭
+ vehicleGps.setOrderByColumn("collect_time");
+ vehicleGps.setIsAsc("desc");
List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
ExcelUtil<VehicleGps> util = new ExcelUtil<VehicleGps>(VehicleGps.class);
return util.exportExcel(list, "杞﹁締GPS鍧愭爣鏁版嵁");
--
Gitblit v1.9.1