From 57a26dab8612f2da5a1b073d6276dc3bb58d43d3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 23 十月 2024 10:30:59 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
index db92ff2..1e6a642 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
@@ -1,6 +1,6 @@
 package com.dy.common.mw.protocol.p206V1_0_0.upVos;
 
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
+import com.dy.common.mw.protocol.UpComResVo;
 import lombok.Data;
 
 /**
@@ -10,7 +10,7 @@
  * @Description
  */
 @Data
-public class DataCd5EVo {
+public class DataCd5EVo implements UpComResVo {
     public DataAlarmVo alarmVo ;
     public DataStateVo stateVo ;
 
@@ -27,4 +27,23 @@
         }
         return sb.toString() ;
     }
+
+    public String comLog(){
+        StringBuilder sb = new StringBuilder() ;
+        sb.append("   鏌ヨ缁堢鐘舵�佸拰鎶ヨ鐘舵�佸懡浠ゅ洖澶�:\n");
+        if(alarmVo != null){
+            sb.append(alarmVo.toString());
+            sb.append("\n");
+        }
+        if(stateVo != null){
+            sb.append(stateVo.toString());
+            sb.append("\n");
+        }
+        return sb.toString() ;
+    }
+
+    @Override
+    public String comLog(String code) {
+        return null;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0