From 7fcdab9411b8936eba28a5c51518e532b18c55ea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 二月 2025 15:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java
index d1fd062..14dbd39 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java
@@ -27,13 +27,21 @@
* 通过站点id查询停车场信息
*/
@PostMapping(value = "/t-parking-lot/getLotBySiteId")
- public R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId);
+ R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId);
+
+ /**
+ * 获取所有停车场数据
+ */
+ @PostMapping(value = "/t-parking-lot/getAllParkingLot")
+ R<List<TParkingLot>> getAllParkingLot();
+
+
@GetMapping(value = "/t-parking-lot/getRecordById")
- public R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId);
+ R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId);
@PostMapping(value = "/t-parking-lot/getRecordAmount")
- public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore);
+ R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore);
/**
@@ -45,4 +53,6 @@
R<TParkingLot> getParkingLotByAppKey(@RequestParam("appKey") String appKey);
@PostMapping(value = "/t-parking-lot/getSiteIdByOrderId")
R<Integer> getSiteIdByOrderId(@RequestParam("id") Long id);
+ @PostMapping(value = "/t-parking-lot/getSiteIdAll")
+ R<List<TParkingRecord>> getSiteIdAll();
}
--
Gitblit v1.7.1