From 17a1681c405fa4984f3303fd1dd4da4bc4a6673e Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期六, 26 十月 2024 11:02:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java | 1 + ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 9 ++++++--- ruoyi-service/ruoyi-order/src/main/resources/logback.xml | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java index a3bcc44..5937ecf 100644 --- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java +++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingOrderAndUploadRealTimeMonitoringDataDto.java @@ -21,6 +21,7 @@ public class ChargingOrderAndUploadRealTimeMonitoringDataDto extends BaseModel { private String id; + private Integer index; private String transaction_serial_number; // 交易流水号 private String charging_pile_code; // 桩编码 private String charging_gun_code; // 抢号 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 1a968ba..f8ff260 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 @@ -804,7 +804,7 @@ // } // Set<String> strings = map.keySet(); - + mongoChargingOrderQuery.setPageSize(2); List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData(); List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>(); @@ -820,13 +820,16 @@ BeanUtils.copyProperties(chargingOrderVO, dataDto); } BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto); - + dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime()); + dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime()); dtos.add(dataDto); }else { continue; } } - + for (int i = 0; i < dtos.size(); i++) { + dtos.get(i).setIndex(i); + } return R.ok(dtos); } diff --git a/ruoyi-service/ruoyi-order/src/main/resources/logback.xml b/ruoyi-service/ruoyi-order/src/main/resources/logback.xml index 61d523e..ea899ba 100644 --- a/ruoyi-service/ruoyi-order/src/main/resources/logback.xml +++ b/ruoyi-service/ruoyi-order/src/main/resources/logback.xml @@ -60,9 +60,9 @@ <!-- 系统模块日志级别控制 --> <logger name="com.ruoyi" level="info" /> <!-- Spring日志级别控制 --> - <logger name="org.springframework" level="warn" /> + <logger name="org.springframework" level="debug" /> - <root level="info"> + <root level="debug"> <appender-ref ref="console" /> </root> -- Gitblit v1.7.1