From 40a8157440e3b906da8f52e07d939d78c3f4c313 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 12 四月 2026 16:14:06 +0800
Subject: [PATCH] feat: 任务增加统计、同步增加通知
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 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 5d64960..65652d2 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
@@ -241,12 +241,41 @@
}
/**
- * 鏌ヨ杞﹁締鍘嗗彶杞ㄨ抗
+ * 鏌ヨ杞﹁締鍘嗗彶杞ㄨ抗锛堣皟鐢℅PS骞冲彴鎺ュ彛锛�
*/
@PreAuthorize("@ss.hasPermi('system:gps:query')")
@GetMapping("/tracks")
public TableDataInfo getTracks(String vehicleNo, String beginTime, String endTime) {
return getAnonymousTracks(vehicleNo, beginTime, endTime);
+ }
+
+ /**
+ * 浠庢湰鍦版暟鎹簱鏌ヨ杞﹁締琛岄┒杞ㄨ抗锛堝ぉ鍦板浘杞ㄨ抗椤典娇鐢級
+ * 鏀寔杞︾墝鍙锋ā绯婃煡璇� + 鏃堕棿鑼冨洿绮剧‘鏌ヨ
+ */
+ @PreAuthorize("@ss.hasPermi('system:gps:list')")
+ @GetMapping("/tracksByPlate")
+ public TableDataInfo getTracksByPlate(String vehicleNo, String beginTime, String endTime) {
+ try {
+ if (vehicleNo == null || vehicleNo.trim().isEmpty()) {
+ return getDataTable(new ArrayList<>());
+ }
+ VehicleGps query = new VehicleGps();
+ query.setVehicleNo(vehicleNo.trim());
+ if (beginTime != null && !beginTime.isEmpty()) {
+ query.setBeginTime(beginTime.replace("T", " "));
+ }
+ if (endTime != null && !endTime.isEmpty()) {
+ query.setEndTime(endTime.replace("T", " "));
+ }
+ query.setOrderByColumn("collect_time");
+ query.setIsAsc("asc");
+ List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(query);
+ return getDataTable(list);
+ } catch (Exception e) {
+ logger.error("浠庢暟鎹簱鏌ヨ杞﹁締杞ㄨ抗澶辫触", e);
+ return getDataTable(new ArrayList<>());
+ }
}
@@ -1304,15 +1333,15 @@
if (count == null) {
count = 10;
}
-
- // 鏋勫缓澶╁湴鍥炬櫘閫氭悳绱PI URL
+ //{"keyWord":"骞垮窞澶╂渤妫犱笅","level":12,"mapBound":"116.02524,39.83833,116.65592,39.99185","queryType":1,"start":0,"count":10}
+ // 鏋勫缓澶╁湴鍥炬櫘閫氭悳绱PI URL http://api.tianditu.gov.cn/v2/search
String url = "http://api.tianditu.gov.cn/v2/search";
StringBuilder paramsBuilder = new StringBuilder();
paramsBuilder.append("postStr={\"keyWord\":\"").append(keyWord).append("\"");
// 纭紪鐮佷腑鍥藉湴鍥捐寖鍥�
paramsBuilder.append(",\"mapBound\":\"").append("73.66,3.86,135.05,53.55").append("\"");
// 榛樿绾у埆涓�18
- paramsBuilder.append(",\"level\":\"").append("18").append("\"");
+ paramsBuilder.append(",\"level\":\"").append("12").append("\"");
// 榛樿鏌ヨ绫诲瀷涓烘櫘閫氭悳绱�
paramsBuilder.append(",\"queryType\":\"").append("1").append("\"");
// 榛樿璧峰浣嶇疆涓�0
@@ -1320,12 +1349,12 @@
paramsBuilder.append(",\"count\":\"").append(count).append("\"");
// 娣诲姞鍙�夊弬鏁�
- if (region != null && !region.trim().isEmpty()) {
- paramsBuilder.append(",\"specify\":\"").append(region).append("\"");
- }
- if (city != null && !city.trim().isEmpty()) {
- paramsBuilder.append(",\"dataTypes\":\"").append(city).append("\"");
- }
+// if (region != null && !region.trim().isEmpty()) {
+// paramsBuilder.append(",\"specify\":\"").append(region).append("\"");
+// }
+// if (city != null && !city.trim().isEmpty()) {
+// paramsBuilder.append(",\"dataTypes\":\"").append(city).append("\"");
+// }
paramsBuilder.append("}");
paramsBuilder.append("&type=query");
@@ -1349,7 +1378,9 @@
}
JSONArray results = jsonResponse.getJSONArray("pois");
-
+ if(results==null|| results.isEmpty()){
+ return AjaxResult.error("鏈壘鍒板尮閰嶇殑鍦板潃");
+ }
// 鏋勫缓杩斿洖缁撴灉
List<Map<String, Object>> suggestions = new ArrayList<>();
--
Gitblit v1.9.1