Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

 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();
    
    

    @PostMapping(value = "/t-parking-lot/getRecordById")
    public R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId);
    @GetMapping(value = "/t-parking-lot/getRecordById")
    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);
    
    
    /**
@@ -43,4 +51,6 @@
     */
    @PostMapping(value = "/t-parking-lot/getParkingLotByAppKey")
    R<TParkingLot> getParkingLotByAppKey(@RequestParam("appKey") String appKey);
    @PostMapping(value = "/t-parking-lot/getSiteIdByOrderId")
    R<Integer> getSiteIdByOrderId(@RequestParam("id") Long id);
}