From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +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/DataCd39And69Vo.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
index 2122403..a1ca3e6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
@@ -1,5 +1,7 @@
 package com.dy.common.mw.protocol.p206V1_0_0.upVos;
 
+import com.dy.common.mw.protocol.UpComResVo;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
 import lombok.Data;
 
 /**
@@ -9,7 +11,7 @@
  * @Description
  */
 @Data
-public class DataCd39And69Vo {
+public class DataCd39And69Vo implements UpComResVo {
     public Double batteryVoltAlarm ;
 
     public String toString(){
@@ -21,4 +23,26 @@
 
         return sb.toString() ;
     }
+
+
+    @Override
+    public String comLog() {
+        return null;
+    }
+
+    public String comLog(String code){
+        StringBuilder sb = new StringBuilder() ;
+        if(code.equals(CodeV1_0_1.cd_39)){
+            sb.append("璁剧疆鐢垫睜鐢靛帇鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+            sb.append("   鐢靛帇鎶ヨ鍊硷細");
+            sb.append(batteryVoltAlarm);
+            sb.append("\n");
+        } else if(code.equals(CodeV1_0_1.cd_69)){
+            sb.append("鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+            sb.append("   鐢靛帇鎶ヨ鍊硷細");
+            sb.append(batteryVoltAlarm);
+            sb.append("\n");
+        }
+        return sb.toString() ;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0