From ade57fcc639e316087f8598d87f1ef90277f33f4 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期日, 11 十月 2020 15:34:23 +0800
Subject: [PATCH] 添加备用加载电机绕组温度字段

---
 Motor_MonitorServer/src/com/motor/data/Load_motor_state.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/Motor_MonitorServer/src/com/motor/data/Load_motor_state.java b/Motor_MonitorServer/src/com/motor/data/Load_motor_state.java
index 85f2cdf..94e8b57 100644
--- a/Motor_MonitorServer/src/com/motor/data/Load_motor_state.java
+++ b/Motor_MonitorServer/src/com/motor/data/Load_motor_state.java
@@ -25,11 +25,14 @@
 	public float load_motor_wind_tmp1;			//加载电机绕组温度1			1119
 	public float load_motor_wind_tmp2;			//加载电机绕组温度2			1120
 	public float load_motor_wind_tmp3;			//加载电机绕组温度3			1121
-	public float load_motor_bear_tmp1;			//加载电机轴承温度1			1122
-	public float load_motor_bear_tmp2;			//加载电机轴承温度2			1123
+	public float load_motor_wind_tmp1_bp;		//备用加载电机绕组温度1		1122
+	public float load_motor_wind_tmp2_bp;		//备用加载电机绕组温度2		1123
+	public float load_motor_wind_tmp3_bp;		//备用加载电机绕组温度3		1124
+	public float load_motor_bear_tmp1;			//加载电机轴承温度1	 DE轴承温度    1125		
+	public float load_motor_bear_tmp2;			//加载电机轴承温度2	 NDE轴承温度  1127		
 	public float load_motor_out_tmp;			//加载电机出口温度			1250
 	public float load_motor_into_tmp;			//加载电机进口温度			1124
-	public float load_motor_torque;				//加载电机转矩				1251
+	public float load_motor_torque;				//加载电机转矩	[传感器转矩330]				1251
 	public int load_motor_start;				//加载电机启动				5680
 	public int load_motor_downtime;				//加载电机停机				5681
 	public int load_add;						//加载						8000
@@ -103,6 +106,31 @@
 	public float getLoad_motor_into_tmp() {
 		return load_motor_into_tmp;
 	}
+	
+	public float getLoad_motor_wind_tmp1_bp() {
+		return load_motor_wind_tmp1_bp;
+	}
+
+	public float getLoad_motor_wind_tmp2_bp() {
+		return load_motor_wind_tmp2_bp;
+	}
+
+	public float getLoad_motor_wind_tmp3_bp() {
+		return load_motor_wind_tmp3_bp;
+	}
+
+	public void setLoad_motor_wind_tmp1_bp(float load_motor_wind_tmp1_bp) {
+		this.load_motor_wind_tmp1_bp = load_motor_wind_tmp1_bp;
+	}
+
+	public void setLoad_motor_wind_tmp2_bp(float load_motor_wind_tmp2_bp) {
+		this.load_motor_wind_tmp2_bp = load_motor_wind_tmp2_bp;
+	}
+
+	public void setLoad_motor_wind_tmp3_bp(float load_motor_wind_tmp3_bp) {
+		this.load_motor_wind_tmp3_bp = load_motor_wind_tmp3_bp;
+	}
+
 	public float getLoad_motor_torque() {
 		return load_motor_torque;
 	}
@@ -238,11 +266,11 @@
 		batch.addLocator(11,MyModbusUtils.createBaseLocator(1119, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度1	1119
 		batch.addLocator(12,MyModbusUtils.createBaseLocator(1120, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度2	1120
 		batch.addLocator(13,MyModbusUtils.createBaseLocator(1121, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度3	1121
-		batch.addLocator(14,MyModbusUtils.createBaseLocator(1122, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度1	1122
-		batch.addLocator(15,MyModbusUtils.createBaseLocator(1123, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度2	1123
+		batch.addLocator(14,MyModbusUtils.createBaseLocator(1125, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度1	1125
+		batch.addLocator(15,MyModbusUtils.createBaseLocator(1127, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度2	1127
 		batch.addLocator(16,MyModbusUtils.createBaseLocator(1250, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机出口温度	1250
 		batch.addLocator(17,MyModbusUtils.createBaseLocator(1124, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机进口温度	1124
-		batch.addLocator(18,MyModbusUtils.createBaseLocator(1251, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机转矩		1251
+		batch.addLocator(18,MyModbusUtils.createBaseLocator(330, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机转矩		1251
 		batch.addLocator(19,MyModbusUtils.createBaseLocator(5680, master));											//加载电机启动		5680
 		batch.addLocator(20,MyModbusUtils.createBaseLocator(5681, master));											//加载电机停机		5681
 		batch.addLocator(21,MyModbusUtils.createBaseLocator(8000, master));											//加载			8000
@@ -251,6 +279,9 @@
 		batch.addLocator(24,MyModbusUtils.createBaseLocator(16005, master));										//加载电机紧停		16005
 		batch.addLocator(25,MyModbusUtils.createBaseLocator(17082, master));										//加载电机风机状态	17082
 		
+		batch.addLocator(26,MyModbusUtils.createBaseLocator(1122, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度1		1122
+		batch.addLocator(27,MyModbusUtils.createBaseLocator(1123, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度2		1123
+		batch.addLocator(28,MyModbusUtils.createBaseLocator(1124, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度3		1124
 		return batch;
 	}
 	
@@ -285,11 +316,11 @@
 		batch.addLocator(11,MyModbusUtils.createBaseLocator(1119, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度1	1119
 		batch.addLocator(12,MyModbusUtils.createBaseLocator(1120, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度2	1120
 		batch.addLocator(13,MyModbusUtils.createBaseLocator(1121, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机绕组温度3	1121
-		batch.addLocator(14,MyModbusUtils.createBaseLocator(1122, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度1	1122
-		batch.addLocator(15,MyModbusUtils.createBaseLocator(1123, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度2	1123
+		batch.addLocator(14,MyModbusUtils.createBaseLocator(1125, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度1	1125
+		batch.addLocator(15,MyModbusUtils.createBaseLocator(1127, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机轴承温度2	1127
 		batch.addLocator(16,MyModbusUtils.createBaseLocator(1250, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机出口温度	1250
 		batch.addLocator(17,MyModbusUtils.createBaseLocator(1124, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机进口温度	1124
-		batch.addLocator(18,MyModbusUtils.createBaseLocator(1251, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机转矩		1251
+		batch.addLocator(18,MyModbusUtils.createBaseLocator(330, DataType.TWO_BYTE_INT_SIGNED, master));			//加载电机转矩		1251
 		batch.addLocator(19,MyModbusUtils.createBaseLocator(5680, master));											//加载电机启动		5680
 		batch.addLocator(20,MyModbusUtils.createBaseLocator(5681, master));											//加载电机停机		5681
 		batch.addLocator(21,MyModbusUtils.createBaseLocator(8000, master));											//加载			8000
@@ -297,6 +328,9 @@
 		batch.addLocator(23,MyModbusUtils.createBaseLocator(8040, master));											//手动加载			8040
 		batch.addLocator(24,MyModbusUtils.createBaseLocator(16005, master));										//加载电机紧停		16005
 		batch.addLocator(25,MyModbusUtils.createBaseLocator(17082, master));										//加载电机风机状态	17082
+		batch.addLocator(26,MyModbusUtils.createBaseLocator(1122, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度1		1122
+		batch.addLocator(27,MyModbusUtils.createBaseLocator(1123, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度2		1123
+		batch.addLocator(28,MyModbusUtils.createBaseLocator(1124, DataType.TWO_BYTE_INT_SIGNED, master));			//备用加载电机绕组温度3		1124
 		return batch;
 	}
 
@@ -332,6 +366,10 @@
 			this.load_manual = MyModbusUtils.readBooleanToInt(res.getValue(23));																		//手动加载					8040
 			this.load_motor_stop = MyModbusUtils.readBooleanToInt(res.getValue(24));																//加载电机紧停				16005
 			this.load_motor_fan_state = MyModbusUtils.readBooleanToInt(res.getValue(25));													//加载电机风机状态	17082																															
+			
+			this.load_motor_wind_tmp1_bp = MyModbusUtils.readShortToFloat(res.getValue(26));				//备用加载电机绕组温度1		1122
+			this.load_motor_wind_tmp2_bp = MyModbusUtils.readShortToFloat(res.getValue(27));				//备用加载电机绕组温度2		1123	
+			this.load_motor_wind_tmp3_bp = MyModbusUtils.readShortToFloat(res.getValue(28));				//备用加载电机绕组温度3		1124
 			this.record_time = new Date();
 		}
 	}
@@ -378,6 +416,10 @@
 			this.load_manual = MyModbusUtils.readBooleanToInt(res.getValue(23));																		//手动加载					8040
 			this.load_motor_stop = MyModbusUtils.readBooleanToInt(res.getValue(24));																//加载电机紧停				16005
 			this.load_motor_fan_state = MyModbusUtils.readBooleanToInt(res.getValue(25));													//加载电机风机状态	17082																															
+			
+			this.load_motor_wind_tmp1_bp = MyModbusUtils.readShortToFloat(res.getValue(26));				//备用加载电机绕组温度1		1122
+			this.load_motor_wind_tmp2_bp = MyModbusUtils.readShortToFloat(res.getValue(27));				//备用加载电机绕组温度2		1123	
+			this.load_motor_wind_tmp3_bp = MyModbusUtils.readShortToFloat(res.getValue(28));				//备用加载电机绕组温度3		1124
 			this.record_time = new Date();
 		}
 	}

--
Gitblit v1.9.1