From 3038ae5412652d3e4561bdc7d181e8393c958ac9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 十月 2024 11:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
index 2857dfc..bd76411 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java
@@ -76,10 +76,10 @@
* @param endCharge 实体对象
* @return
*/
- @PostMapping("/endCharge")
- public String endCharge(@RequestBody EndCharge endCharge){
- return iotMessageProduce.sendMessage(endCharge.getCharging_pile_code(), ServiceIdMenu.END_CHARGE.getKey(),messageUtil.endCharge(endCharge));
- }
+// @PostMapping("/endCharge")
+// public String endCharge(@RequestBody EndCharge endCharge){
+// return iotMessageProduce.sendMessage(endCharge.getCharging_pile_code(), ServiceIdMenu.END_CHARGE.getKey(),messageUtil.endCharge(endCharge));
+// }
/**
* 运营平台确认启动充电
@@ -182,6 +182,16 @@
}
/**
+ * 对时设置应答
+ * @param timingSettingReply 实体对象
+ * @return
+ */
+ @PostMapping("/timingSettingReply")
+ public String timingSettingReply(@RequestBody TimingSettingReply timingSettingReply){
+ return iotMessageProduce.sendMessage(timingSettingReply.getCharging_pile_code(), ServiceIdMenu.TIMING_SETTING_REPLY.getKey(),messageUtil.timingSettingReply(timingSettingReply));
+ }
+
+ /**
* 计费模型设置
* @param setupBillingModel 实体对象
* @return
@@ -218,5 +228,14 @@
public String platformRemoteUpdate(@RequestBody PlatformRemoteUpdate platformRemoteUpdate){
return iotMessageProduce.sendMessage(platformRemoteUpdate.getCharging_pile_code(), ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getKey(),messageUtil.platformRemoteUpdate(platformRemoteUpdate));
}
+ /**
+ * 二维码下发
+ * @param qrCodeDelivery 实体对象
+ * @return
+ */
+ @PostMapping("/qrCodeDelivery")
+ public String qrCodeDelivery(@RequestBody QrCodeDelivery qrCodeDelivery){
+ return iotMessageProduce.sendMessage(qrCodeDelivery.getCharging_pile_code(), ServiceIdMenu.QR_CODE_DELIVERY.getKey(),messageUtil.qrCodeDelivery(qrCodeDelivery));
+ }
}
--
Gitblit v1.7.1