From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 0312dd8..fea8b39 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
@@ -3,6 +3,7 @@
import com.ruoyi.chargingPile.api.factory.ParkingLotFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TParkingLot;
+import com.ruoyi.chargingPile.api.model.TParkingRecord;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -23,7 +26,21 @@
/**
* 通过站点id查询停车场信息
*/
- @GetMapping(value = "/t-parking-lot/getLotBySiteId")
+ @PostMapping(value = "/t-parking-lot/getLotBySiteId")
public R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId);
+ @PostMapping(value = "/t-parking-lot/getRecordById")
+ public R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId);
+
+ @PostMapping(value = "/t-parking-lot/getRecordAmount")
+ public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore);
+
+
+ /**
+ * 根据停车场标识查询停车场
+ * @param appKey
+ * @return
+ */
+ @PostMapping(value = "/t-parking-lot/getParkingLotByAppKey")
+ R<TParkingLot> getParkingLotByAppKey(@RequestParam("appKey") String appKey);
}
--
Gitblit v1.7.1