From ff265ba53df1d9e89ae2d4258007cd2e02811f8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 18:16:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 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 606a5d2..eef31a6 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
@@ -7,11 +7,13 @@
import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.BasePojo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -68,26 +70,58 @@
*/
@PostMapping("/listAll")
R<GovernmentCloudChargingPileVO> listAll() {
- LocalDateTime end = LocalDateTime.now();
- LocalDateTime start = LocalDateTime.now().minusDays(1);
+ 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().between(Partner::getCreateTime, start, end).list();
- List<Site> list2 = siteService.lambdaQuery().between(Site::getCreateTime, start, end).list();
- List<TAccountingStrategyDetail> list3 = accountingStrategyDetailService.lambdaQuery().between(TAccountingStrategyDetail::getCreateTime, start, end).list();
- List<TAccountingStrategy> list4 = accountingStrategyService.lambdaQuery().between(TAccountingStrategy::getCreateTime, start, end).list();
- List<TApplyChargingPile> list5 = applyChargingPileService.lambdaQuery().between(TApplyChargingPile::getCreateTime, start, end).list();
- List<TCarport> list6 = carportService.lambdaQuery().between(TCarport::getCreateTime, start, end).list();
- List<TChargingGun> list7 = chargingGunService.lambdaQuery().between(TChargingGun::getCreateTime, start, end).list();
- List<TChargingPile> list8 = chargingPileService.lambdaQuery().between(TChargingPile::getCreateTime, start, end).list();
- List<TChargingPileNotification> list9 = chargingPileNotificationService.lambdaQuery().between(TChargingPileNotification::getCreateTime, start, end).list();
- List<TFaultMessage> list10 = faultMessageService.lambdaQuery().between(TFaultMessage::getCreateTime, start, end).list();
- List<TMonitoringEquipment> list11 = monitoringEquipmentService.lambdaQuery().between(TMonitoringEquipment::getCreateTime, start, end).list();
- List<TParkingLot> list12 = parkingLotService.lambdaQuery().between(TParkingLot::getCreateTime, start, end).list();
- List<TParkingRecord> list13 = parkingRecordService.lambdaQuery().between(TParkingRecord::getCreateTime, start, end).list();
-// List<TPartnerSite> list14 = invoiceInformationService.lambdaQuery().between(TPartnerSite::getCreateTime, start, end).list();
- List<TRepair> list15 = repairService.lambdaQuery().between(TRepair::getCreateTime, start, end).list();
- List<TVehicleRamp> list16 = vehicleRampService.lambdaQuery().between(TVehicleRamp::getCreateTime, start, end).list();
-// List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list();
+ 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<TAccountingStrategy> list4 = accountingStrategyService.lambdaQuery()
+ .ge(TAccountingStrategy::getCreateTime,start)
+ .le(TAccountingStrategy::getCreateTime,end) .list();
+ List<TApplyChargingPile> list5 = applyChargingPileService.lambdaQuery()
+ .ge(TApplyChargingPile::getCreateTime,start)
+ .le(TApplyChargingPile::getCreateTime,end) .list();
+ List<TCarport> list6 = carportService.lambdaQuery()
+ .ge(TCarport::getCreateTime,start)
+ .le(TCarport::getCreateTime,end) .list();
+ List<TChargingGun> list7 = chargingGunService.lambdaQuery()
+ .ge(TChargingGun::getCreateTime,start)
+ .le(TChargingGun::getCreateTime,end) .list();
+ List<TChargingPile> list8 = chargingPileService.lambdaQuery()
+ .ge(TChargingPile::getCreateTime,start)
+ .le(TChargingPile::getCreateTime,end) .list();
+ List<TChargingPileNotification> list9 = chargingPileNotificationService.lambdaQuery()
+ .ge(TChargingPileNotification::getCreateTime,start)
+ .le(TChargingPileNotification::getCreateTime,end) .list();
+ List<TFaultMessage> list10 = faultMessageService.lambdaQuery()
+ .ge(TFaultMessage::getCreateTime,start)
+ .le(TFaultMessage::getCreateTime,end) .list();
+ List<TMonitoringEquipment> list11 = monitoringEquipmentService.lambdaQuery()
+ .ge(TMonitoringEquipment::getCreateTime,start)
+ .le(TMonitoringEquipment::getCreateTime,end) .list();
+ List<TParkingLot> list12 = parkingLotService.lambdaQuery()
+ .ge(TParkingLot::getCreateTime,start)
+ .le(TParkingLot::getCreateTime,end) .list();
+ List<TParkingRecord> list13 = parkingRecordService.lambdaQuery()
+ .ge(TParkingRecord::getCreateTime,start)
+ .le(TParkingRecord::getCreateTime,end) .list();
+ List<TPartnerSite> list14 = partnerSiteService.list();
+ List<TRepair> list15 = repairService.lambdaQuery()
+ .ge(TRepair::getCreateTime,start)
+ .le(TRepair::getCreateTime,end) .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();
governmentCloudAccountVO.setPartners(list1);
governmentCloudAccountVO.setSites(list2);
@@ -102,10 +136,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