From 20075860ecd50806f7eb594e1d959dd72c871f8a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:19:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 886759b..c23a6a6 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
@@ -3,6 +3,7 @@
import cn.hutool.db.sql.Direction;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
@@ -61,7 +62,7 @@
}
@Override
- public List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
+ public UploadRealTimeMonitoringPageData getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
Query query = new Query();
// if (!values.isEmpty()){
// query.addCriteria(Criteria.where("transaction_serial_number").in(values));
@@ -70,10 +71,10 @@
query.addCriteria(Criteria.where("transaction_serial_number").regex(mongoChargingOrderQuery.getCode(), "i")); // "i" 表示不区分大小写
}
if (mongoChargingOrderQuery.getOrderType() !=null){
- query.addCriteria(Criteria.where("order_type").is(mongoChargingOrderQuery.getOrderType()));
+ query.addCriteria(Criteria.where("orderType").is(mongoChargingOrderQuery.getOrderType()));
}
if (mongoChargingOrderQuery.getSiteId() != null){
- query.addCriteria(Criteria.where("site_id").is(mongoChargingOrderQuery.getSiteId()));
+ query.addCriteria(Criteria.where("siteId").is(mongoChargingOrderQuery.getSiteId()));
}
if (mongoChargingOrderQuery.getChargingPileCode() != null && !mongoChargingOrderQuery.getChargingPileCode().isEmpty()) {
query.addCriteria(Criteria.where("charging_pile_code").is(mongoChargingOrderQuery.getChargingPileCode()));
@@ -107,14 +108,22 @@
+
+
+
+ long totalElements = mongoTemplate.count(query, UploadRealTimeMonitoringData.class);
// 设置分页
Pageable pageable = PageRequest.of(mongoChargingOrderQuery.getPageCurr(), mongoChargingOrderQuery.getPageSize());
query.with(pageable);
-
+ query.with(Sort.by(Sort.Direction.DESC,"create_time"));
List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find(
- query.with(Sort.by("create_time"))
+ query
, UploadRealTimeMonitoringData.class);
- return uploadRealTimeMonitoringData;
+
+ UploadRealTimeMonitoringPageData uploadRealTimeMonitoringPageData = new UploadRealTimeMonitoringPageData();
+ uploadRealTimeMonitoringPageData.setCount(totalElements);
+ uploadRealTimeMonitoringPageData.setRecords(uploadRealTimeMonitoringData);
+ return uploadRealTimeMonitoringPageData;
}
@Override
@@ -130,4 +139,10 @@
return mongoTemplate.findOne(query, UploadRealTimeMonitoringData.class);
}
+ @Override
+ public void delete(String id) {
+ UploadRealTimeMonitoringData byId = findById(id.toString());
+ mongoTemplate.remove(byId);
+ }
+
}
--
Gitblit v1.7.1