From 0431c6943c1a61df0e9e4feb61f3333dd3622d21 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 28 五月 2025 15:16:48 +0800 Subject: [PATCH] 1、表阀一体:查询日记录数据中金额数据小数位是4位,相应除以10000.00; 2、表阀一体:所以命令结果VO实现指定接口,以数据库中保存命令日志。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java index 8eab817..b972ff2 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java @@ -1,12 +1,15 @@ package com.dy.common.mw.protocol.p206V202404.upVos; +import com.dy.common.mw.protocol.UpComResVo; +import com.dy.common.mw.protocol.p206V202404.CodeV202404; +import com.dy.common.mw.protocol.p206V202404.CommonV202404; import lombok.Data; //鏌ヨ鎺у埗鍣↖P鍦板潃 @Data -public class DataCd86Vo { +public class DataCd86Vo implements UpComResVo { - public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� public Integer projectNo ;//椤圭洰缂栧彿: public Integer channel ;//IP閫氶亾鍙� public String ip ;//IP @@ -14,6 +17,9 @@ public String comName ;//鍛戒护鍚嶇О + public DataCd86Vo(){ + this.comName = CodeV202404.getCodeName(CodeV202404.cd_86) ; + } public DataCd86Vo(String comName){ this.comName = comName ; } @@ -22,7 +28,7 @@ StringBuffer sb = new StringBuffer() ; sb.append(" " + comName + " : \n") ; sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ; - sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ; + sb.append(CommonV202404.ctrlDevType(controllerType)) ; sb.append("\n") ; sb.append(" 椤圭洰缂栧彿 : ") ; sb.append(projectNo == null?"鏈煡":projectNo) ; @@ -40,4 +46,38 @@ return sb.toString() ; } + public String toStr(boolean showBase){ + StringBuffer sb = new StringBuffer() ; + if(showBase){ + sb.append(comName + " : \n") ; + sb.append("鎺у埗鍣ㄧ被鍨� : ") ; + sb.append(CommonV202404.ctrlDevType(controllerType)) ; + sb.append("\n") ; + sb.append("椤圭洰缂栧彿 : ") ; + sb.append(projectNo == null?"鏈煡":projectNo) ; + sb.append("\n") ; + } + sb.append("IP閫氶亾鍙� : ") ; + sb.append(channel == null?"鏈煡":channel) ; + sb.append("\n") ; + sb.append("ip : ") ; + sb.append(ip == null?"鏈煡":ip) ; + sb.append("\n") ; + sb.append("绔彛鍙� : ") ; + sb.append(port == null?"鏈煡":port) ; + sb.append("\n") ; + + return sb.toString() ; + } + public String comLog(){ + StringBuilder sb = new StringBuilder() ; + sb.append("鏌ヨ璁惧缁堢IP鍦板潃鍥炲:\n"); + sb.append(toStr(false)) ; + return sb.toString() ; + } + + @Override + public String comLog(String code) { + return null; + } } -- Gitblit v1.8.0