Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-18 06ea0fe23faf2238d9d1141826ecb404367aecec

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

@@ -2,10 +2,12 @@

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;
@@ -24,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
@@ -35,5 +44,5 @@
   R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(@RequestParam("code") String code);

   @PostMapping("/uploadRealTimeMonitoringData/getAll")
   R<List<UploadRealTimeMonitoringData>> getAll(@RequestParam("values") Set<String> values, @RequestParam("page") Integer page, @RequestParam("size")Integer size);
   R<List<UploadRealTimeMonitoringData>> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery);
}