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-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
index f3659c2..8318a46 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
@@ -1,10 +1,9 @@
package com.dy.testClient.tcpClient;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
-import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
+import com.dy.common.mw.protocol.p206V1.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
/**
* @Author: liurunyu
@@ -14,15 +13,15 @@
public class RtuUpData {
private static byte[] creatHead(String rtuAddr, String code, byte ctrl)throws Exception {
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte[] bsHead = new byte[ProtocolConstantV206V1.lenHead2Code] ;
byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = 0 ;//甯ч暱搴�
index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜
@@ -209,20 +208,20 @@
* @throws Exception 寮傚父
*/
public static byte[] createCdC0(String rtuAddr) throws Exception {
- CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
+ CommonV1 commonV_1 = new CommonV1() ;
byte[] bytes ;
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte[] bsHead = new byte[ProtocolConstantV206V1.lenHead2Code] ;
byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = 0 ;//甯ч暱搴�
index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
+ bsHead[index] = commonV_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
index++ ;
GlCreate.createRtuAddr(rtuAddr, bsHead, index);
--
Gitblit v1.8.0