From 1bb359cfaf2dae58a300c553303481c1cfc02bb9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:41:44 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index 0669173..0bf55f3 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -416,7 +416,7 @@
@ApiOperation(value = "测试",tags = {"硬件接口"})
@GetMapping(value = "/test")
- public R test() {
+ public R test(String code) {
String orderNum = "2024092646526785213546";
String deviceId = "3401231001200202";
Long orderId = 2024065544L;
@@ -424,7 +424,7 @@
PlatformStartCharging platformStartCharging = new PlatformStartCharging();
platformStartCharging.setTransaction_serial_number(orderNum);
platformStartCharging.setCharging_pile_code(deviceId);
- platformStartCharging.setCharging_gun_code("02");
+ platformStartCharging.setCharging_gun_code(code);
platformStartCharging.setCard_number(orderId.toString());
platformStartCharging.setAccount_balance(money);
String message = iotMessageProduce.sendMessage(platformStartCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_START_CHARGING.getKey(), messageUtil.platformStartCharging(platformStartCharging));
@@ -434,10 +434,10 @@
@ApiOperation(value = "测试",tags = {"硬件接口"})
@GetMapping(value = "/stop")
- public R test1() {
+ public R test1(String code) {
PlatformStopCharging platformStopCharging = new PlatformStopCharging();
platformStopCharging.setCharging_pile_code("3401231001200202");
- platformStopCharging.setCharging_gun_code("02");
+ platformStopCharging.setCharging_gun_code(code);
String message = iotMessageProduce.sendMessage(platformStopCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_STOP_CHARGING.getKey(),messageUtil.platformStopCharging(platformStopCharging));
return R.ok(message);
}
--
Gitblit v1.7.1