From dbbdd1006f15da8579d709598ce11116e8f70bfe Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 14 十二月 2020 14:22:14 +0800
Subject: [PATCH] 修复bug

---
 Central_Monitor/src/com/data/Central_RT_Data.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Central_Monitor/src/com/data/Central_RT_Data.java b/Central_Monitor/src/com/data/Central_RT_Data.java
index 747139d..9b65fc1 100644
--- a/Central_Monitor/src/com/data/Central_RT_Data.java
+++ b/Central_Monitor/src/com/data/Central_RT_Data.java
@@ -38,14 +38,14 @@
 
 	public void putBatchResult(BatchResults<Integer> res) {
 		if(null != res) {
-			switch_close = (int)res.getValue(0);    // '开关合闸状态',
-			switch_open = (int)res.getValue(1);     // '开关分闸状态',
-			switch_fault = (int)res.getValue(2);    // '开关故障状态',
+			switch_close = MyModbusUtils.readBooleanToInt(res.getValue(0));    // '开关合闸状态',
+			switch_open = MyModbusUtils.readBooleanToInt(res.getValue(1));     // '开关分闸状态',
+			switch_fault = MyModbusUtils.readBooleanToInt(res.getValue(2));    // '开关故障状态',
 			if(10001 == dev_id) {
-				panel_vol  = (int)res.getValue(3);    // '进线屏电压',
-				panel_curr = (int)res.getValue(4) ;   // '进线屏电流',
+				panel_vol  = MyModbusUtils.readShortToInt(res.getValue(3));    // '进线屏电压',
+				panel_curr = MyModbusUtils.readShortToInt(res.getValue(4));   // '进线屏电流',
 			}else {
-				panel_curr = (int)res.getValue(3) ;   // '进线屏电流',
+				panel_curr = MyModbusUtils.readShortToInt(res.getValue(3));   // '进线屏电流',
 			}
 		}
 	}

--
Gitblit v1.9.1