From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确,分析源码,找到bug原因是,财务对账统计只有用户点击后才会触发统计功能,把历史上及当天进行了统计,如果当天统计时未下班,例如是中午触发统计了,而下午又进行了充值售水,但下班后未再点击触发对账统计,那么今天的对账统计完成了但数据不对。编写自动任务,在下半夜进行对账统计。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
index 67b1245..697991e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
@@ -14,20 +14,21 @@
 @AllArgsConstructor
 public class MqttTopic {
     public String orgTag ;//缁勭粐鏍囪瘑
-    public String protocol ;//鍗忚鍚嶇О
-    public String devId ;//璁惧锛團Box锛塈D
-    public String topic ;//娑堟伅涓婚
+    public String protocol ;//鍗忚鍚嶇О(鍚嶇О+鐗堟湰)
+    public String devId ;//璁惧ID(FBox搴忓垪鍙�)
+    public String type;//鏁版嵁锛堝懡浠わ級绫诲瀷
+    public Integer no;//娴嬬珯缂栧彿
 
     public boolean isEmpty(){
-        return orgTag == null || protocol == null || devId == null || topic == null
-                || orgTag.trim().length() == 0 || protocol.trim().length() == 0 || devId.trim().length() == 0 || topic.trim().length() == 0 ;
+        return orgTag == null || protocol == null || devId == null || type == null || no == null
+                || orgTag.trim().length() == 0 || protocol.trim().length() == 0 || devId.trim().length() == 0 || type.trim().length() == 0 || no <= 0 ;
     }
 
     public String shortName(){
-        return topic ;
+        return type + "/" + no;
     }
 
     public String longName(){
-        return orgTag + "/" + protocol + "/" + devId + "/" + topic ;
+        return orgTag + "/" + protocol + "/" + devId + "/" + type + "/" + no;
     }
 }

--
Gitblit v1.8.0