Fisheye: Tag 25343 refers to a dead (removed) revision in file `ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MeiYaJieDataManagerImpl.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 25343 refers to a dead (removed) revision in file `ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataByCommunicationManager.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java	(revision 25343)
@@ -0,0 +1,45 @@
+package com.forgon.disinfectsystem.device.service;
+
+import net.sf.json.JSONObject;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.forgon.device.ModbusControllerManager;
+import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface;
+import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData;
+/**
+ * 美雅洁清洗机设备处理
+ * @author shuyongfu
+ * @since 2018-11-12
+ */
+public class MeiYaJieDataManagerImpl implements DeviceDataByCommunicationManager{
+	private static final Logger logger = Logger.getLogger(MeiYaJieDataManagerImpl.class);
+	
+	@Autowired
+	private ModbusControllerManager modbusControllerManager;
+	
+	@Override
+	public void readAndSaveRecord(DeviceInterface devInteface,WashData washData, int timeoutSeconds) {
+		String ip = devInteface.getIP();//ip地址
+		int post = devInteface.getPort();//端口号
+		String deviceIdStr = devInteface.getDeviceId();//设备id
+		try {
+			//1、获取美雅洁清洗机modbus返回信息
+			JSONObject resultData = modbusControllerManager.getWashModbusDataByMeiYaJie(ip, post, deviceIdStr, timeoutSeconds);
+			//2、washData设值
+			String t1Temp = (String) resultData.get(ModbusControllerManager.WASHDATA_T1TEMP);//t1temp
+			String t2Temp = (String) resultData.get(ModbusControllerManager.WASHDATA_T2TEMP);//t2temp
+			String A0 = (String) resultData.get(ModbusControllerManager.WASHDATA_A0);//A0
+			String time = (String) resultData.get(ModbusControllerManager.WASHDATA_TIME);//time
+			washData.setA0(A0);
+			washData.setT1Temp(t1Temp);
+			washData.setT2Temp(t2Temp);
+			washData.setTime(time);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e.getMessage());
+		}
+	}
+	
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/DeviceDataByCommunicationManager.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/DeviceDataByCommunicationManager.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/DeviceDataByCommunicationManager.java	(revision 25343)
@@ -0,0 +1,22 @@
+package com.forgon.disinfectsystem.device.service;
+
+import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface;
+import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData;
+
+
+/**
+ * 根据通信协议获取设备信息
+ * @author YanWeiNing
+ *
+ */
+public interface DeviceDataByCommunicationManager {
+	
+	/**
+	 * 根据通信协议设置清洗机
+	 * @param devInteface 
+	 * @param washData
+	 * @param timeoutSeconds
+	 */
+	public void readAndSaveRecord(DeviceInterface devInteface,WashData washData,int timeoutSeconds);
+	
+}
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r25340 -r25343
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 25340)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 25343)
@@ -1536,17 +1536,17 @@
 	</bean>
     <!-- 史帝瑞接口 -->
     
-    <!-- 美雅洁接口 -->
+    <!-- 美雅洁清洗机接口 -->
     <bean id="meiYaJieDataManager"
 		 parent="txProxyTemplate">
         <property name="target">
             <ref bean="meiYaJieDataManagerTarget"/>
         </property>
     </bean>
     <bean id="meiYaJieDataManagerTarget"
-		class="com.forgon.disinfectsystem.maintain.device.service.MeiYaJieDataManagerImpl">
+		class="com.forgon.disinfectsystem.device.service.MeiYaJieDataManagerImpl">
 	</bean>
-    <!-- 美雅洁接口 -->
+    <!-- 美雅洁清洗机接口 -->
     
     <!-- 洁定接口 -->
     <bean id="getingeDataManager"