From ae844683ede273edad59085227e36ae3ce02de06 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 22 十月 2024 09:25:30 +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 | 22 ++++++++++++++++++++-- 1 files changed, 20 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..a271fe9 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,5 @@ package com.dy.common.mw.protocol.p206V1_0_0.upVos; -import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1; import lombok.Data; /** @@ -10,7 +9,7 @@ * @Description */ @Data -public class DataCd5EVo { +public class DataCd5EVo implements ComResVo { public DataAlarmVo alarmVo ; public DataStateVo stateVo ; @@ -27,4 +26,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