From ee2bf95f3472a4179ee0fc7c8e4e2a35e1214bc8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 10:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
index 3f4912d..886759b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.mongodb.service.impl;
+import cn.hutool.db.sql.Direction;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.iotda.constant.IotConstant;
@@ -14,6 +15,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
@Service
@@ -51,13 +55,13 @@
query.addCriteria(Criteria.where("transaction_serial_number").is(code));
}
List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find(
- query.with(Sort.by("create_time"))
+ query.with(Sort.by(Sort.Order.desc("create_time")))
, UploadRealTimeMonitoringData.class);
return uploadRealTimeMonitoringData;
}
@Override
- public List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) {
+ public List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
Query query = new Query();
// if (!values.isEmpty()){
// query.addCriteria(Criteria.where("transaction_serial_number").in(values));
@@ -83,13 +87,19 @@
if (mongoChargingOrderQuery.getStartTime() != null) {
String[] split = mongoChargingOrderQuery.getStartTime().split(" - ");
- query.addCriteria(Criteria.where("startTime").gte(split[0]).lt(split[1]));
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date start = dateFormat.parse(split[0]);
+ Date end = dateFormat.parse(split[1]);
+ query.addCriteria(Criteria.where("startTime").gte(start).lt(end));
}
if (mongoChargingOrderQuery.getEndTime() != null && mongoChargingOrderQuery.getEndTime() != null) {
String[] split = mongoChargingOrderQuery.getEndTime().split(" - ");
-
- query.addCriteria(Criteria.where("lastTime").gte(split[0]).lt(split[1]));
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date start = dateFormat.parse(split[0]);
+ Date end = dateFormat.parse(split[1]);
+ query.addCriteria(Criteria.where("lastTime").gte(start).lt(end));
}
--
Gitblit v1.7.1