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/OnLinePool.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
index 2a0d4fc..30c764a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
@@ -6,7 +6,7 @@
 
 public class OnLinePool {
 	
-	protected static HashMap<String, List<OnLine>> pool = new HashMap<String, List<OnLine>>() ; 
+	protected static HashMap<String, List<OnLine>> pool = new HashMap<>() ;
 	
 	/**
 	 * 鐢熸垚瀵硅薄
@@ -15,14 +15,14 @@
 	 */
 	public static synchronized OnLine getInstance(Class<?> clazz)throws Exception {
 		if(pool == null){
-			pool = new HashMap<String, List<OnLine>>() ; 
+			pool = new HashMap<>() ;
 		}
 		String className = clazz.getName() ;
 		OnLine obj = null ;
 		
 		List<OnLine> list = pool.get(className) ;
 		if(list == null){
-			list = new ArrayList<OnLine>() ;
+			list = new ArrayList<>() ;
 		}else{
 			obj = list.get(0) ;
 		}
@@ -32,7 +32,8 @@
 			return obj ;
 		}else{
 			try {
-				obj = (OnLine)clazz.newInstance();
+				obj = (OnLine)clazz.getDeclaredConstructor().newInstance() ;
+				//obj = (OnLine)clazz.newInstance();
 			} catch (Exception e) {
 				throw new Exception( "鐢�" + className + "鐢熸垚瀹炰緥澶辫触锛�");
 			}

--
Gitblit v1.8.0