From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
index 18ff4f4..182609a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
@@ -5,7 +5,6 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.ParseParamsForDownV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd22Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@@ -24,9 +23,11 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV202404.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -79,7 +80,7 @@
if(!NumUtil.isPlusIntNumber(cvo.orderNo)){
throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
}
- if(cvo.orderNo.length() != 12){
+ if(cvo.orderNo.length() != 16){
throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
}
@@ -102,7 +103,7 @@
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
index += 8 ;
- if(cvo.waterRemain != null){
+ if(cvo.waterRemain == null){
cvo.waterRemain = 0.0 ;
}
String strTemp = "" + Double.valueOf(cvo.waterRemain * 100).intValue() ;
@@ -112,15 +113,15 @@
for(int i = 0 ; i < bTempLen; i++){
bs[index++] = bTemp[i] ;
count ++ ;
- if(count >= 4){
+ if(count >= 5){
break ;
}
}
- for(; count < 4; count++){
+ for(; count < 5; count++){
bs[index++] = 0 ;
}
- if(cvo.moneyRemain != null){
+ if(cvo.moneyRemain == null){
cvo.moneyRemain = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.moneyRemain * 100)).intValue() ;
@@ -139,7 +140,7 @@
}
- if(cvo.waterPrice != null){
+ if(cvo.waterPrice == null){
cvo.waterPrice = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.waterPrice * 100)).intValue() ;
@@ -158,7 +159,7 @@
}
- if(cvo.elePrice != null){
+ if(cvo.elePrice == null){
cvo.elePrice = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.elePrice * 100)).intValue() ;
--
Gitblit v1.8.0