From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
index aaa3246..c548eed 100644
--- a/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
@@ -16,10 +16,9 @@
package com.java110.intf.common;
import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
-import com.java110.dto.meterWater.NotifyMeterWaterOrderDto;
+import com.java110.dto.charge.NotifyChargeOrderDto;
+import com.java110.vo.ResultVo;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -44,7 +43,7 @@
* @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
*/
@RequestMapping(value = "/finishCharge", method = RequestMethod.POST)
- ResponseEntity<String> finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
+ ResultVo finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
/**
* 璁惧蹇冭烦
@@ -52,15 +51,8 @@
* @param notifyChargeOrderDto 鏁版嵁瀵硅薄鍒嗕韩
* @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
*/
- @RequestMapping(value = "/heartbeat", method = RequestMethod.POST)
- ResponseEntity<String> heartbeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
+ @RequestMapping(value = "/workHeartbeat", method = RequestMethod.POST)
+ ResultVo workHeartbeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
- /**
- * 鍏呯數蹇冭烦
- *
- * @param notifyChargeOrderDto 鏁版嵁瀵硅薄鍒嗕韩
- * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
- */
- @RequestMapping(value = "/chargeHeartBeat", method = RequestMethod.POST)
- ResponseEntity<String> chargeHeartBeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
+
}
--
Gitblit v1.8.0