From 9d09e1ed51ef330a378f7d564bacced7bb7e7d13 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 三月 2025 15:31:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/MongoChargingOrderQuery.java | 3 ++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/MongoChargingOrderQuery.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/MongoChargingOrderQuery.java
index 5eb904e..a15e8cd 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/MongoChargingOrderQuery.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/MongoChargingOrderQuery.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Set;
@Data
@ApiModel(value = "ChargingOrderQuery充电桩订单查询对象",description = "管理后台充电桩订单查询对象")
@@ -32,5 +33,5 @@
private Integer orderSource;
@ApiModelProperty(value = "用户ids 前端忽略")
private List<Long> userIds;
- private List<Integer> siteIds;
+ private Set<Integer> siteIds;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index be622a9..a5562a3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1152,9 +1152,12 @@
data.addAll(data1);
}
ids = new HashSet<>(data);
+ }else{
+ ids = new HashSet<>();
+ ids.add(-1);
}
}
- mongoChargingOrderQuery.setSiteIds(ids.stream().collect(Collectors.toList()));
+ mongoChargingOrderQuery.setSiteIds(ids);
mongoChargingOrderQuery.setPageSize(10);
R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery);
UploadRealTimeMonitoringPageData data1 = all.getData();
--
Gitblit v1.7.1