From fb67f31baeebf0c44b075250885c1f909a0c57b4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 十月 2024 09:45:49 +0800
Subject: [PATCH] 二维码下发
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 2 ++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java | 1 +
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java | 1 +
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java | 1 +
4 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
index ac3be77..9ae1359 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java
@@ -11,6 +11,7 @@
public class QrCodeDelivery {
private String charging_pile_code; // 桩编码
+ private String charging_gun_code; // 枪编码
private Integer code_format; // "0：第一种前缀+桩编号 1：第二种前缀+桩编号+枪编号"
private Integer prefix_length; // 二维码前缀长度长度最大不超过200 字节
private String code_prefix; // 如：“www.baidu.com?No=”
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index 6e39044..5fda203 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -143,6 +143,7 @@
String code_prefix = "https://mxcd.zhinenganguan.com?No=";
QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+ qrCodeDelivery.setCharging_gun_code(dto.getCode());
qrCodeDelivery.setCode_format(1);
qrCodeDelivery.setPrefix_length(code_prefix.length());
qrCodeDelivery.setCode_prefix(code_prefix);
@@ -179,6 +180,7 @@
String code_prefix = "https://mxcd.zhinenganguan.com?No=";
QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+ qrCodeDelivery.setCharging_gun_code(dto.getCode());
qrCodeDelivery.setCode_format(1);
qrCodeDelivery.setPrefix_length(code_prefix.length());
qrCodeDelivery.setCode_prefix(code_prefix);
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
index bd592d8..267029d 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -289,6 +289,7 @@
public JSONObject getMessageJsonString(Object object, String serviceId){
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object));
jsonObject.put("service_id", serviceId);
+ log.info("发送数据service_id：{},发送内容：{}",serviceId,jsonObject);
return jsonObject;
}
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
index 6b9ad6d..0e4dd03 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java
@@ -11,6 +11,7 @@
public class QrCodeDeliveryMessage extends BaseMessage {
private String charging_pile_code; // 桩编码
+ private String charging_gun_code; // 枪编码
private Integer code_format; // "0：第一种前缀+桩编号 1：第二种前缀+桩编号+枪编号"
private Integer prefix_length; // 二维码前缀长度长度最大不超过200 字节
private String code_prefix; // 如：“www.baidu.com?No=”
--
Gitblit v1.7.1