From 5012f07f2505db600fa15dbc95955f5a6f92ba3e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 26 五月 2025 11:29:25 +0800
Subject: [PATCH] 大屏修改,将储能今日放电字段持久化

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

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 89e9fc1..caab60d 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
@@ -7,7 +7,11 @@
 import com.ruoyi.integration.mongodb.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component
@@ -55,6 +59,10 @@
     private PlatformRestartService platformRestartService;
     @Autowired
     private PlatformRemoteUpdateService platformRemoteUpdateService;
+    @Autowired
+    private QrCodeDeliveryService qrCodeDeliveryService;
+    @Resource
+    private RedisTemplate redisTemplate;
 
     /**
      * 登录认证应答
@@ -62,6 +70,7 @@
      * @return
      */
     public JSONObject onlineReply(OnlineReply onlineReply){
+        log.info("登录认证应答:{}", onlineReply);
         onlineReplyService.create(onlineReply);
         return  getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
     }
@@ -72,7 +81,10 @@
      * @return
      */
     public JSONObject pong(Pong pong){
-        pongService.create(pong);
+        log.info("心跳包应答:{}", pong);
+//        pongService.create(pong);
+        //存储缓存中,5分钟有效
+        redisTemplate.opsForValue().set("pong:" + pong.getCharging_pile_code() + pong.getCharging_gun_code(), pong, 5, TimeUnit.MINUTES);
         return  getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
     }
 
@@ -82,6 +94,7 @@
      * @return
      */
     public JSONObject billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
+        log.info("计费模型验证请求应答:{}", billingModeVerifyReply);
         billingModeVerifyReplyService.create(billingModeVerifyReply);
         return  getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue());
     }
@@ -92,6 +105,7 @@
      * @return
      */
     public JSONObject acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
+        log.info("计费模型验证请求应答:{}", acquisitionBillingModeReply);
         acquisitionBillingModeReplyService.create(acquisitionBillingModeReply);
         return  getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue());
     }
@@ -102,6 +116,7 @@
      * @return
      */
     public JSONObject readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
+        log.info("读取实时监测数据:{}", readRealTimeMonitoringData);
         readRealTimeMonitoringDataService.create(readRealTimeMonitoringData);
         return  getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue());
     }
@@ -264,6 +279,16 @@
     }
 
     /**
+     * 二维码下发
+     * @param qrCodeDelivery 实体对象
+     * @return
+     */
+    public JSONObject qrCodeDelivery(QrCodeDelivery qrCodeDelivery){
+        qrCodeDeliveryService.create(qrCodeDelivery);
+        return  getMessageJsonString(qrCodeDelivery, ServiceIdMenu.QR_CODE_DELIVERY.getValue());
+    }
+
+    /**
      * 统一封装消息
      * @param object 实体对象
      * @param serviceId 服务ID
@@ -272,6 +297,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;
     }
 }

--
Gitblit v1.7.1