From 29eab346b55c74fb1ed3212ff7dcb0c24c7662fa Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 15 五月 2025 11:22:31 +0800 Subject: [PATCH] 示范区项目,虚拟卡表的占用状态及剩余金额需要设置成默认值,即不占用,不减费。修改原来的实现,增加设备剩余金额为默认值10000,配置项名称也做了达意修改。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java index c49025c..38d2a03 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java @@ -1,17 +1,22 @@ package com.dy.common.mw.protocol.p206V202404.upVos; +import com.dy.common.mw.protocol.p206V202404.CodeV202404; +import com.dy.common.mw.protocol.p206V202404.CommonV202404; import lombok.Data; //鏌ヨ璁惧骞寸敤姘撮噺 @Data public class DataCd9AVo { - public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� public Integer projectNo ;//椤圭洰缂栧彿 public Integer maxAmountYear ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999 public String comName ;//鍛戒护鍚嶇О + public DataCd9AVo(){ + this.comName = CodeV202404.getCodeName(CodeV202404.cd_9A) ; + } public DataCd9AVo(String comName){ this.comName = comName ; } @@ -20,7 +25,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) ; @@ -31,4 +36,21 @@ 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("骞寸敤姘撮噺 : ") ; + sb.append(maxAmountYear == null?"鏈煡":maxAmountYear) ; + sb.append("\n") ; + return sb.toString() ; + } + } -- Gitblit v1.8.0