From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
index 5a8a9a4..a8fc559 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.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 DataCd38And68Vo {
+public class DataCd38And68Vo implements UpComResVo {
public Double remainMoneyAlarm ;
public String toString(){
@@ -21,4 +23,25 @@
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_38)){
+ sb.append("璁剧疆鐢ㄦ埛浣欓鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 浣欓锛�");
+ sb.append(remainMoneyAlarm);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_68)){
+ sb.append("鏌ヨ鐢ㄦ埛浣欓鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 浣欓锛�");
+ sb.append(remainMoneyAlarm);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0