Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-18 fca00ddabb395a44c99b0a39b47a7cd2955aede0

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

@@ -7,6 +7,7 @@
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;

/**
 * 充电服务
@@ -61,8 +62,8 @@
     * @param endCharge 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageendCharge")
    public R<String> endCharge(@RequestBody EndCharge endCharge);
//    @PostMapping("/sendMessage/sendMessageendCharge")
//    public R<String> endCharge(@RequestBody EndCharge endCharge);

    /**
     * 运营平台确认启动充电
@@ -149,7 +150,7 @@
     * @param setupBillingModel 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagesetupBillingModel")
    @PostMapping("/sendMessage/setupBillingModel")
    public R<String> setupBillingModel(@RequestBody SetupBillingModel setupBillingModel);

    /**
@@ -173,5 +174,14707 @@
     */
    @PostMapping("/sendMessage/sendMessageplatformRemoteUpdate")
    public R<String> platformRemoteUpdate(@RequestBody PlatformRemoteUpdate platformRemoteUpdate);
    

    @PostMapping("/iot/setupBillingModel")
    public R<String> setupBillingModel1(@RequestParam("deviceId") String deviceId);












































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































}