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/CodeV202404.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
index ed18635..cbfccd6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CodeV202404.java
@@ -29,7 +29,7 @@
public static final String cd_83 = "83" ; //閬ユ祴缁堢瀹氱偣涓婃姤
public static final String cd_84 = "84" ; //鍒峰崱寮�娉�/闃�涓婃姤
public static final String cd_85 = "85" ; //鍒峰崱鍏虫车/闃�涓婃姤
- public static final String cd_9A = "9A" ; //娓呴櫎骞寸敤姘撮噺鍜屽勾鐢ㄧ數閲�
+ public static final String cd_9A = "9A" ; //鏌ヨ骞寸敤姘撮噺
public static final String cd_26 = "26" ; //璁剧疆璁惧缁堢骞寸敤姘撮噺
public static final String cd_21 = "21" ; //璁剧疆璁惧缁堢IP鍦板潃
public static final String cd_86 = "86" ; //鏌ヨ璁惧缁堢IP鍦板潃
@@ -70,7 +70,7 @@
(code.equals(cd_83) ? "閬ユ祴缁堢瀹氱偣涓婃姤" :
(code.equals(cd_84) ? "鍒峰崱寮�娉�/闃�涓婃姤" :
(code.equals(cd_85) ? "鍒峰崱鍏虫车/闃�涓婃姤" :
- (code.equals(cd_9A) ? "娓呴櫎骞寸敤姘撮噺鍜屽勾鐢ㄧ數閲�" :
+ (code.equals(cd_9A) ? "鏌ヨ骞寸敤姘撮噺" :
(code.equals(cd_26) ? "璁剧疆璁惧缁堢骞寸敤姘撮噺" :
(code.equals(cd_21) ? "璁剧疆璁惧缁堢IP鍦板潃" :
(code.equals(cd_86) ? "鏌ヨ璁惧缁堢IP鍦板潃" :
@@ -83,6 +83,9 @@
(code.equals(cd_9C) ? "榛戝悕鍗曡繙绋嬪己鍒跺叧闂按娉�/闃�闂�" :
(code.equals(cd_C2) ? "寮�鍏虫按娉�/闃�闂ㄧ粨鏋滀笂鎶�" :
""))))))))))))))))))))))))))))))))))))))) ;
+ if(name == null || name.equals("")){
+ name = code ;
+ }
return name ;
}
--
Gitblit v1.8.0