From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务,并在满足条件下结束定时任务,为此实现抽象类TimerTaskJob类,并在UpgradeManager类中应用; 2、TreadJob类由TimerTaskJob替换,弃用TreadJob类。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
index 06f782a..1770eee 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd80_5BVo.java
@@ -1,9 +1,11 @@
 package com.dy.common.mw.protocol.p206V202404.upVos;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 //璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class DataCd80_5BVo extends AlarmVo {
 
 	public String controllerType;//鎺у埗鍣ㄧ被鍨�:   01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
@@ -143,6 +145,9 @@
 		sb.append("      姘磋〃宸ヤ綔鐢靛帇 : ") ;
 		sb.append(waterMeterWorkVolt == null?"鏈煡":waterMeterWorkVolt) ;
 		sb.append("\n") ;
+		sb.append("      淇″彿寮哄害 : ") ;
+		sb.append(csq == null?"鏈煡":csq) ;
+		sb.append("\n") ;
 		return sb.toString() + super.toString() ;
 	}
 

--
Gitblit v1.8.0