From 42bf8a2dd15aec70cb5c38896472b7f759c67dcb Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 14 二月 2025 18:04:53 +0800 Subject: [PATCH] 修改三方平台对接bug --- ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 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..5d6df9f 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,15 @@ 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 com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Set; /** * @author zhibing.pu @@ -23,8 +25,14 @@ * @return */ @PostMapping("/uploadRealTimeMonitoringData/getOrderInfoByCode") - R<UploadRealTimeMonitoringData> chargingOrderInfo(String orderId); - + R<UploadRealTimeMonitoringData> chargingOrderInfo(@RequestParam("orderId") String orderId); + + /** + * 批量查询 + * @return + */ + @GetMapping(value = "/uploadRealTimeMonitoringData/getOrderInfoByCodes/{ids}") + public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@PathVariable("ids") String ids); /** * 根据订单编号获取所有监测数据 * @param code @@ -32,4 +40,10 @@ */ @PostMapping("/uploadRealTimeMonitoringData/getDataByOrderCode") R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(@RequestParam("code") String code); + + @PostMapping("/uploadRealTimeMonitoringData/getAll") + R<UploadRealTimeMonitoringPageData> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery); + + @PostMapping("/uploadRealTimeMonitoringData/delete") + R delete(@RequestParam("id") String id); } -- Gitblit v1.7.1