From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index cbf61a2..f03adee 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -33,6 +33,7 @@
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -163,7 +164,8 @@
*/
@PostMapping(value = "/getAllParkingLot")
public R<List<TParkingLot>> getAllParkingLot(){
- List<TParkingLot> list = parkingLotService.list(new LambdaQueryWrapper<TParkingLot>().eq(TParkingLot::getDelFlag, 0));
+ List<TParkingLot> list = parkingLotService.list(new LambdaQueryWrapper<TParkingLot>()
+ .eq(TParkingLot::getDelFlag, 0));
return R.fail(list);
}
@@ -200,7 +202,18 @@
R<Integer> getSiteIdByOrderId(@RequestParam("id") Long id){
TParkingRecord byId = parkingRecordService.getById(id);
TParkingLot parkingLot = parkingLotService.getById(byId.getParkingLotId());
- return R.ok(parkingLot.getId());
+ return R.ok(parkingLot.getSiteId());
+ }
+ @PostMapping(value = "/getSiteIdAll")
+ R<List<TParkingRecord>> getSiteIdAll(){
+ List<TParkingRecord> list = parkingRecordService.list();
+ for (TParkingRecord tParkingRecord : list) {
+ TParkingLot parkingLot = parkingLotService.getById(tParkingRecord.getParkingLotId());
+ if (parkingLot!=null){
+ tParkingRecord.setSiteId(parkingLot.getSiteId());
+ }
+ }
+ return R.ok(list);
}
}
--
Gitblit v1.7.1