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-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java | 13 ++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 29 ++++++++++++++
ruoyi-ui/src/views/system/gps/map.vue | 67 ++++++++++++++++++---------------
4 files changed, 80 insertions(+), 30 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 bc6b087..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,12 +35,17 @@
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");
@@ -47,6 +56,26 @@
@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");
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index c94dfb6..6deaa72 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -179,6 +179,7 @@
SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
if(clientApp==null){
log.error("鍥炶皟鍦板潃涓嶅瓨鍦�");
+ orderStatusService.updateAOrderStatusFlag(orderStatus.getId());
continue;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java
index b9d84ff..a2b492b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java
@@ -70,6 +70,11 @@
/** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
private String isAsc;
+ /**
+ * 璁㈠崟鍙凤紝鎺ユ敹璇锋眰鐢ㄧ殑
+ */
+ private Long orderId;
+
public void setGpsId(Long gpsId) {
this.gpsId = gpsId;
}
@@ -198,6 +203,14 @@
this.isAsc = isAsc;
}
+ public void setOrderId(Long orderId){
+ this.orderId = orderId;
+ }
+
+ public Long getOrderId(){
+ return this.orderId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-ui/src/views/system/gps/map.vue b/ruoyi-ui/src/views/system/gps/map.vue
index 27705dd..08bcec3 100644
--- a/ruoyi-ui/src/views/system/gps/map.vue
+++ b/ruoyi-ui/src/views/system/gps/map.vue
@@ -176,26 +176,33 @@
created() {
// 鑾峰彇URL鍙傛暟
const query = this.$route.query;
- if (query.vehicleNo) {
- this.queryParams.vehicleNo = query.vehicleNo;
- } else {
- this.$message.error('缂哄皯杞︾墝鍙峰弬鏁�');
+ // if (query.vehicleNo) {
+ // this.queryParams.vehicleNo = query.vehicleNo;
+ // } else {
+ // this.$message.error('缂哄皯杞︾墝鍙峰弬鏁�');
+ // return;
+ // }
+ //鑾峰彇璁㈠崟鍙�
+ this.queryParams.orderId = query.orderId;
+ if(this.queryParams.orderId==null)
+ {
+ this.$message.error('缂哄皯璁㈠崟鍙峰弬鏁�');
return;
}
// 妫�鏌ユ椂闂村弬鏁�
- if (query.beginTime && query.endTime) {
- // 鏍煎紡鍖栨椂闂�
- this.dateRange = [
- this.formatDateTime(query.beginTime),
- this.formatDateTime(query.endTime)
- ];
- this.queryParams.beginTime = this.dateRange[0];
- this.queryParams.endTime = this.dateRange[1];
- } else {
- this.$message.error('缂哄皯鏃堕棿鑼冨洿鍙傛暟');
- return;
- }
+ // if (query.beginTime && query.endTime) {
+ // // 鏍煎紡鍖栨椂闂�
+ // this.dateRange = [
+ // this.formatDateTime(query.beginTime),
+ // this.formatDateTime(query.endTime)
+ // ];
+ // this.queryParams.beginTime = this.dateRange[0];
+ // this.queryParams.endTime = this.dateRange[1];
+ // } else {
+ // this.$message.error('缂哄皯鏃堕棿鑼冨洿鍙傛暟');
+ // return;
+ // }
// 璁剧疆璁よ瘉鍙傛暟
if (query.appId) {
@@ -272,20 +279,20 @@
};
// 濡傛灉娌℃湁閫夋嫨鏃堕棿鑼冨洿锛屽垯浣跨敤URL涓殑鏃堕棿
- if (!this.dateRange || this.dateRange.length === 0) {
- const query = this.$route.query;
- if (query.beginTime && query.endTime) {
- params.beginTime = query.beginTime;
- params.endTime = query.endTime;
- } else {
- this.$message.error('璇烽�夋嫨鏃堕棿鑼冨洿');
- this.loading = false;
- return;
- }
- } else {
- params.beginTime = this.dateRange[0];
- params.endTime = this.dateRange[1];
- }
+ // if (!this.dateRange || this.dateRange.length === 0) {
+ // const query = this.$route.query;
+ // if (query.beginTime && query.endTime) {
+ // params.beginTime = query.beginTime;
+ // params.endTime = query.endTime;
+ // } else {
+ // this.$message.error('璇烽�夋嫨鏃堕棿鑼冨洿');
+ // this.loading = false;
+ // return;
+ // }
+ // } else {
+ // params.beginTime = this.dateRange[0];
+ // params.endTime = this.dateRange[1];
+ // }
anonymousList(params).then(response => {
this.gpsList = response.rows;
--
Gitblit v1.9.1