From 007bb91e70a5129304de1837f60161c6f5f3ad4f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
index 71dea2a..c33a3c3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnit.java
@@ -5,7 +5,7 @@
 
 import com.dy.common.mw.UnitAdapterInterface;
 import com.dy.common.mw.UnitInterface;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
 
 
 public class ProtocolUnit implements UnitInterface {
@@ -39,12 +39,12 @@
 	/**
 	 * 鍚姩妯″潡
 	 */
-	public void start(UnitStartedCallbackInterface callback) throws Exception {
+	public void start(UnitCallbackInterface callback) throws Exception {
 		//寰楀埌鍞竴瀹炰緥锛� 骞跺湪鐢熸垚鍞竴瀹炰緥鏃讹紝鎵弿娉ㄨВ绫�
 		AnnotationScan.getIntance() ;
 		
 		//鍚勪釜鍗忚椹卞姩绫绘壂鎻忚嚜宸辩殑鍔熻兘鐮佹敞瑙�
-		HashMap<String, AnnotationDriverVo> drivers =  ProtocolCach.getDriverMap() ;
+		HashMap<String, AnnotationDriverVo> drivers =  ProtocolCache.getDriverMap() ;
 		Collection<String> colDrivers = drivers.keySet() ;
 		StringBuilder totalProtocols = new StringBuilder() ;
 		for(String protocolName : colDrivers){
@@ -52,7 +52,7 @@
 				totalProtocols.append("锛�") ;
 			}
 			totalProtocols.append(protocolName) ;
-			Driver dri = ProtocolCach.getDriver(protocolName) ;
+			Driver dri = ProtocolCache.getDriver(protocolName) ;
 			if(dri != null){
 				dri.scanAnnotationCode();
 			}
@@ -70,12 +70,12 @@
 	 */
 	@SuppressWarnings("unused")
 	public boolean isOnlyOneProtocol(){
-		HashMap<String, AnnotationDriverVo> drivers =  ProtocolCach.getDriverMap() ;
+		HashMap<String, AnnotationDriverVo> drivers =  ProtocolCache.getDriverMap() ;
 		return drivers.size() == 1 ;
 	}
 
 	@Override
-	public void stop(UnitStartedCallbackInterface callback) {
+	public void stop(UnitCallbackInterface callback) {
 	}
 	
 	/*

--
Gitblit v1.8.0