From 9594f2b1529bd6a63297c0b275e40847f34f564d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 03 二月 2026 20:30:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
index 6cd6c29..2ff6110 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingPileInfoController.java
@@ -100,12 +100,12 @@
@ResponseBody
@PostMapping("/orderList")
@ApiOperation(value = "获取充电订单", tags = {"司机端-获取充电订单"}, notes = "")
- public R<String> chargingPileList(){
+ public R<String> chargingPileList(Integer pageNo, Integer pageSize){
List<TChargingGun> chargingGun = chargingGunClient.getAllGun().getData();
chargingGun = chargingGun.stream().filter(e->StringUtils.hasLength(e.getConnectorID()))
.collect(Collectors.toList());
- List<ChargeOrder> result = getOrderList();
+ List<ChargeOrder> result = getOrderList(pageNo, pageSize);
List<TChargingOrder> orders = new ArrayList<>();
List<TChargingOrderAccountingStrategy> accountingStrategies = new ArrayList<>();
@@ -581,31 +581,32 @@
}
return result;
}
- private List<ChargeOrder> getOrderList(){
- String s = chargePileHttpUtil.getOrderList(1, 199);
+ private List<ChargeOrder> getOrderList(Integer pageNo, Integer pageSize){
+
+ String s = chargePileHttpUtil.getOrderList(pageNo, pageSize);
// 将s字符串转化为json 然后转化为实体类PageInfo
JSONObject jsonObject = JSONObject.parseObject(s);
com.ruoyi.jianguan.domain.PageInfo pageInfo = JSON.parseObject(jsonObject.toJSONString(), com.ruoyi.jianguan.domain.PageInfo.class);
List<ChargeOrder> result = new ArrayList<>();
int itemSize = pageInfo.getItemSize();
int temp = 0;
- if(itemSize>199){
+// if(itemSize>pageSize){
+// result.addAll(pageInfo.getChargeOrders());
+// int i = itemSize / pageNo;
+// for (int j = 2; j < i + 2; j++) {
+// s = chargePileHttpUtil.getOrderList(j, pageSize);
+// // 将s字符串转化为json 然后转化为实体类PageInfo
+// jsonObject = JSONObject.parseObject(s);
+// pageInfo = JSON.parseObject(jsonObject.toJSONString(), com.ruoyi.jianguan.domain.PageInfo.class);
+// result.addAll(pageInfo.getChargeOrders());
+// if (temp ==20){
+// break;
+// }
+// temp++;
+// }
+// }else {
result.addAll(pageInfo.getChargeOrders());
- int i = itemSize / 199;
- for (int j = 2; j < i + 2; j++) {
- s = chargePileHttpUtil.getOrderList(j, 199);
- // 将s字符串转化为json 然后转化为实体类PageInfo
- jsonObject = JSONObject.parseObject(s);
- pageInfo = JSON.parseObject(jsonObject.toJSONString(), com.ruoyi.jianguan.domain.PageInfo.class);
- result.addAll(pageInfo.getChargeOrders());
- if (temp==7){
- break;
- }
- temp++;
- }
- }else {
- result.addAll(pageInfo.getChargeOrders());
- }
+// }
return result;
}
--
Gitblit v1.7.1