From 56abd8830c7c8166d995d7ad3ba014ad6a44c988 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 13:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java
index d6da53d..aa641de 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java
@@ -2,13 +2,16 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
import com.ruoyi.integration.api.factory.UploadRealTimeMonitoringDataFallbackFactory;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Set;
/**
* @author zhibing.pu
@@ -23,8 +26,15 @@
* @return
*/
@PostMapping("/uploadRealTimeMonitoringData/getOrderInfoByCode")
- R<UploadRealTimeMonitoringData> chargingOrderInfo(String orderId);
-
+ R<UploadRealTimeMonitoringData> chargingOrderInfo(@RequestParam("orderId") String orderId);
+
+ /**
+ * 批量查询
+ * @param orderId
+ * @return
+ */
+ @PostMapping(value = "/uploadRealTimeMonitoringData/getOrderInfoByCodes")
+ public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@RequestParam("orderId") String orderId);
/**
* 根据订单编号获取所有监测数据
* @param code
@@ -32,4 +42,7 @@
*/
@PostMapping("/uploadRealTimeMonitoringData/getDataByOrderCode")
R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(@RequestParam("code") String code);
+
+ @PostMapping("/uploadRealTimeMonitoringData/getAll")
+ R<List<UploadRealTimeMonitoringData>> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery);
}
--
Gitblit v1.7.1