From 6406a54f7d2b67b46eae0e7987900974b34be5d7 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 24 六月 2025 21:03:10 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev --- ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java index 1def769..2bc67bc 100644 --- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java +++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/PlatformStopChargingServiceImpl.java @@ -12,7 +12,9 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; +import java.util.Objects; @Service public class PlatformStopChargingServiceImpl implements PlatformStopChargingService { @@ -37,10 +39,10 @@ } @Override - public List<PlatformStopCharging> getRangeTimeData(String startTime, String endTime) { + public List<PlatformStopCharging> getRangeTimeData(Date startTime, Date endTime) { Query query = new Query(); // 根据时间范围查询 - if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { + if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) { query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime)); } List<PlatformStopCharging> list = mongoTemplate.find( -- Gitblit v1.7.1