From 4a8411147f0341005f746148fdaac64014f65813 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 七月 2025 09:04:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
index 7688348..706f0c2 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
@@ -70,58 +70,56 @@
*/
@PostMapping("/listAll")
R<GovernmentCloudChargingPileVO> listAll() {
- String start = LocalDate.now().minusDays(1)+" 00:00:00";
- String end = LocalDate.now().minusDays(1)+" 23:59:59";
+
GovernmentCloudChargingPileVO governmentCloudAccountVO = new GovernmentCloudChargingPileVO();
List<Partner> list1 = partnerService.lambdaQuery()
- .ge(Partner::getCreateTime,start)
- .le(Partner::getCreateTime,end)
+
.list();
List<Site> list2 = siteService.lambdaQuery()
- .ge(Site::getCreateTime,start)
- .le(Site::getCreateTime,end)
+
.list();
List<TAccountingStrategyDetail> list3 = accountingStrategyDetailService.lambdaQuery()
- .ge(TAccountingStrategyDetail::getCreateTime,start)
- .le(TAccountingStrategyDetail::getCreateTime,end) .list();
+
+ .list();
List<TAccountingStrategy> list4 = accountingStrategyService.lambdaQuery()
- .ge(TAccountingStrategy::getCreateTime,start)
- .le(TAccountingStrategy::getCreateTime,end) .list();
+
+ .list();
List<TApplyChargingPile> list5 = applyChargingPileService.lambdaQuery()
- .ge(TApplyChargingPile::getCreateTime,start)
- .le(TApplyChargingPile::getCreateTime,end) .list();
+
+ .list();
List<TCarport> list6 = carportService.lambdaQuery()
- .ge(TCarport::getCreateTime,start)
- .le(TCarport::getCreateTime,end) .list();
+
+ .list();
List<TChargingGun> list7 = chargingGunService.lambdaQuery()
- .ge(TChargingGun::getCreateTime,start)
- .le(TChargingGun::getCreateTime,end) .list();
+
+ .list();
List<TChargingPile> list8 = chargingPileService.lambdaQuery()
- .ge(TChargingPile::getCreateTime,start)
- .le(TChargingPile::getCreateTime,end) .list();
+
+ .list();
List<TChargingPileNotification> list9 = chargingPileNotificationService.lambdaQuery()
- .ge(TChargingPileNotification::getCreateTime,start)
- .le(TChargingPileNotification::getCreateTime,end) .list();
+
+ .list();
List<TFaultMessage> list10 = faultMessageService.lambdaQuery()
- .ge(TFaultMessage::getCreateTime,start)
- .le(TFaultMessage::getCreateTime,end) .list();
+
+ .list();
List<TMonitoringEquipment> list11 = monitoringEquipmentService.lambdaQuery()
- .ge(TMonitoringEquipment::getCreateTime,start)
- .le(TMonitoringEquipment::getCreateTime,end) .list();
+
+ .list();
List<TParkingLot> list12 = parkingLotService.lambdaQuery()
- .ge(TParkingLot::getCreateTime,start)
- .le(TParkingLot::getCreateTime,end) .list();
+
+ .list();
List<TParkingRecord> list13 = parkingRecordService.lambdaQuery()
- .ge(TParkingRecord::getCreateTime,start)
- .le(TParkingRecord::getCreateTime,end) .list();
-// List<TPartnerSite> list14 = invoiceInformationService.lambdaQuery().between(TPartnerSite::getCreateTime, start, end).list();
+
+ .list();
+ List<TPartnerSite> list14 = partnerSiteService.list();
List<TRepair> list15 = repairService.lambdaQuery()
- .ge(TRepair::getCreateTime,start)
- .le(TRepair::getCreateTime,end) .list();
+
+ .list();
List<TVehicleRamp> list16 = vehicleRampService.lambdaQuery()
- .ge(TVehicleRamp::getCreateTime,start)
- .le(TVehicleRamp::getCreateTime,end) .list();
-// List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list();
+
+ .list();
+ List<TSiteMenu> list17 = siteMenuService.lambdaQuery()
+ .list();
governmentCloudAccountVO.setPartners(list1);
governmentCloudAccountVO.setSites(list2);
@@ -136,10 +134,10 @@
governmentCloudAccountVO.setMonitoringEquipments(list11);
governmentCloudAccountVO.setParkingLots(list12);
governmentCloudAccountVO.setParkingRecords(list13);
-// governmentCloudAccountVO.setPartnerSites(list14);
+ governmentCloudAccountVO.setPartnerSites(list14);
governmentCloudAccountVO.setRepairs(list15);
governmentCloudAccountVO.setVehicleRamps(list16);
-// governmentCloudAccountVO.setSiteMenus(list17);
+ governmentCloudAccountVO.setSiteMenus(list17);
return R.ok(governmentCloudAccountVO);
}
--
Gitblit v1.7.1