Merge remote-tracking branch 'origin/master'

puzhibing

2025-02-05 74b0e0814e37d640596f44ec86d20fa9ecce9ed6

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java

@@ -5,10 +5,9 @@
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.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Set;
@@ -30,11 +29,10 @@

   /**
    * 批量查询
    * @param orderId
    * @return
    */
   @PostMapping(value = "/uploadRealTimeMonitoringData/getOrderInfoByCodes")
   public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@RequestParam("orderId") String orderId);
   @GetMapping(value = "/uploadRealTimeMonitoringData/getOrderInfoByCodes/{ids}")
   public R<List<UploadRealTimeMonitoringData>> getOrderInfoByCodes(@PathVariable("ids") String ids);
   /**
    * 根据订单编号获取所有监测数据
    * @param code
@@ -44,5 +42,8 @@
   R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(@RequestParam("code") String code);

   @PostMapping("/uploadRealTimeMonitoringData/getAll")
   R<List<UploadRealTimeMonitoringData>> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery);
   R<UploadRealTimeMonitoringPageData> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery);

   @PostMapping("/uploadRealTimeMonitoringData/delete")
   R delete(@RequestParam("id") String id);
}