From 52952b8b5d92efc12eabf007ff57bf9fed3c7e8a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 14:40:13 +0800
Subject: [PATCH] 大屏vo
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 529427e..b63291a 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
@@ -2,6 +2,7 @@
import cn.hutool.db.sql.Direction;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
import com.ruoyi.integration.iotda.constant.IotConstant;
@@ -20,6 +21,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -78,6 +80,9 @@
if (mongoChargingOrderQuery.getSiteId() != null){
query.addCriteria(Criteria.where("siteId").is(mongoChargingOrderQuery.getSiteId()));
}
+ if (!mongoChargingOrderQuery.getSiteIds().isEmpty()){
+ query.addCriteria(Criteria.where("siteId").in(mongoChargingOrderQuery.getSiteIds()));
+ }
if (mongoChargingOrderQuery.getChargingPileCode() != null && !mongoChargingOrderQuery.getChargingPileCode().isEmpty()) {
query.addCriteria(Criteria.where("charging_pile_code").is(mongoChargingOrderQuery.getChargingPileCode()));
}
@@ -88,21 +93,21 @@
query.addCriteria(Criteria.where("status").is(mongoChargingOrderQuery.getStatus()));
}
- if (mongoChargingOrderQuery.getStartTime() != null) {
- String[] split = mongoChargingOrderQuery.getStartTime().split(" - ");
+ if (mongoChargingOrderQuery.getCreateTime() != null) {
+ String[] split = mongoChargingOrderQuery.getCreateTime().split(" - ");
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));
+ query.addCriteria(Criteria.where("create_time").gte(start).lt(end));
}
- if (mongoChargingOrderQuery.getEndTime() != null && mongoChargingOrderQuery.getEndTime() != null) {
- String[] split = mongoChargingOrderQuery.getEndTime().split(" - ");
+ if (mongoChargingOrderQuery.getLastTime() != null && mongoChargingOrderQuery.getLastTime() != null) {
+ String[] split = mongoChargingOrderQuery.getLastTime().split(" - ");
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));
+ query.addCriteria(Criteria.where("last_time").gte(start).lt(end));
}
@@ -170,5 +175,12 @@
// 执行更新操作
mongoTemplate.updateFirst(query, update, UploadRealTimeMonitoringData.class);
}
-
+
+
+ @Override
+ public void taskDelete() {
+ Query query = new Query();
+ query.addCriteria(Criteria.where("create_time").lt(LocalDateTime.now().minusMonths(2)));
+ mongoTemplate.remove(query, UploadRealTimeMonitoringData.class);
+ }
}
--
Gitblit v1.7.1