From 52952d6feed8a9df738c652cda6c7d1ca50d2921 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 17:20:23 +0800
Subject: [PATCH] 1、修改rtuAddr注释 2、实现开关阀自报协议 3、实现开阀工作报 4、《编码设计》
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java
index 1a9753e..58dddb1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolCach.java
@@ -1,7 +1,6 @@
package com.dy.common.mw.protocol;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -9,26 +8,27 @@
public class ProtocolCach {
//鏈郴缁熶腑锛孌river鍦ㄥ崟绾跨▼涓繍琛岋紝鎵�浠ュ彧鐢ㄤ竴涓疄渚�
- private static HashMap<String, Driver> drivers = new HashMap<String, Driver>() ;
+ private static final HashMap<String, Driver> drivers = new HashMap<>() ;
//娉ㄨВ涓庡鐞嗙被鐨勬槧灏�
- private static HashMap<String, AnnotationDriverVo> driverMap = new HashMap<String, AnnotationDriverVo>() ;
- private static HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = new HashMap<String, AnnotationPrefixedDataAvailableVo>() ;
- private static HashMap<String, AnnotationOnLineVo> onLineMap = new HashMap<String, AnnotationOnLineVo>() ;
+ private static final HashMap<String, AnnotationDriverVo> driverMap = new HashMap<>() ;
+ private static final HashMap<String, AnnotationPrefixedDataAvailableVo> prefixedDataAvailableMap = new HashMap<>() ;
+ private static final HashMap<String, AnnotationOnLineVo> onLineMap = new HashMap<>() ;
/**
* 鍦ㄥ崟绾跨▼鐜涓繍琛�
* 閫氳繃鍗忚椹卞姩鐨勭被鍚嶏紝寰楀埌绫诲崟渚�
- * @param protocolName
- * @return
- * @throws Exception
+ * @param protocolName 鍗忚鍚嶇О
+ * @return 椹卞姩
+ * @throws Exception 寮傚父
*/
public static Driver getDriver(String protocolName) throws Exception{
Driver dri = drivers.get(protocolName);
if(dri == null){
AnnotationDriverVo vo = driverMap.get(protocolName) ;
if(vo != null && vo.clazz != null){
- dri = (Driver)vo.clazz.newInstance() ;
+ dri = (Driver)vo.clazz.getDeclaredConstructor().newInstance();
+ //dri = (Driver)vo.clazz.newInstance() ;
drivers.put(protocolName, dri) ;
}
}
@@ -37,10 +37,10 @@
/**
* 寰楀埌椹卞姩鐨勬暟閲忥紝鍗充腑闂翠欢鏀寔鐨勫崗璁暟閲�
- * @return
+ * @return 椹卞姩鎬绘暟
*/
public static int driverCount(){
- if(drivers == null || drivers.size() == 0){
+ if(drivers.size() == 0){
return 0 ;
}else{
return drivers.size() ;
@@ -49,11 +49,11 @@
/**
* 寰楀埌绗竴涓┍鍔�
- * @return
+ * @return 椹卞姩
*/
- public static Driver getFirstDriver() throws Exception{
+ public static Driver getFirstDriver(){
Driver dri = null ;
- if(drivers != null && drivers.size() > 0){
+ if(drivers.size() > 0){
Map.Entry<String, Driver> ent = drivers.entrySet().iterator().next() ;
dri = ent.getValue();
}
@@ -62,15 +62,11 @@
/**
* 寰楀埌鎵�鏈夊崗璁悕绉�
- * @return
+ * @return 鍗忚鍚嶇О闆嗗悎
*/
+ @SuppressWarnings("unused")
public static List<String> getProtocolList() {
- List<String> list = new ArrayList<String>() ;
- Collection<String> col = driverMap.keySet() ;
- for(String pname : col){
- list.add(pname) ;
- }
- return list;
+ return new ArrayList<>(driverMap.keySet()) ;
}
protected static HashMap<String, AnnotationDriverVo> getDriverMap() {
@@ -83,4 +79,11 @@
return onLineMap;
}
+ public static void main(String[] args){
+ HashMap<String, Integer> mp = new HashMap<>() ;
+ mp.put("a1", 1) ;
+ mp.put("a2", 2) ;
+ List<String> list = new ArrayList<>(mp.keySet()) ;
+ System.out.println(list);
+ }
}
--
Gitblit v1.8.0