From 5d011e20bd297e5a34b916226f1c37672eff2ef0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:35:01 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java | 11 +++++++++--
1 files changed, 9 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 d39a68e..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
@@ -1,6 +1,7 @@
package com.ruoyi.integration.api.factory;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.*;
import org.slf4j.Logger;
@@ -33,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) {
@@ -43,7 +45,12 @@
}
@Override
- public R<List<UploadRealTimeMonitoringData>> getAll(Set<String> values, Integer page, Integer size) {
+ public R<UploadRealTimeMonitoringPageData> getAll(MongoChargingOrderQuery mongoChargingOrderQuery) {
+ return R.fail("getAll：" + throwable.getMessage());
+ }
+
+ @Override
+ public R delete(String id) {
return null;
}
};
--
Gitblit v1.7.1