From e0577365ee91fc275854e3ed6dd3b44396a4efa2 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 31 十月 2024 16:11:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java index 5a46c09..e5298d0 100644 --- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java @@ -34,9 +34,10 @@ } @Override - public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(String orderId) { + public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(String ids) { return R.fail("根据订单编号s获取所有监测数据失败:" + throwable.getMessage()); } + @Override public R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(String code) { @@ -45,7 +46,7 @@ @Override public R<UploadRealTimeMonitoringPageData> getAll(MongoChargingOrderQuery mongoChargingOrderQuery) { - return null; + return R.fail("getAll:" + throwable.getMessage()); } @Override -- Gitblit v1.7.1