From d336a445bea92b3459ab8b3bf5c8971039c66e33 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 14 十二月 2020 15:14:44 +0800
Subject: [PATCH] 修复bug
---
Central_Monitor/src/com/data/Central_ST_Data.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Central_Monitor/src/com/data/Central_ST_Data.java b/Central_Monitor/src/com/data/Central_ST_Data.java
index d9d58f5..04607e0 100644
--- a/Central_Monitor/src/com/data/Central_ST_Data.java
+++ b/Central_Monitor/src/com/data/Central_ST_Data.java
@@ -63,25 +63,25 @@
public void putBatchResult(BatchResults<Integer> res) {
if(null != res) {
- switch_close_1st_2500A = (int) res.getValue(0); //'1号2500A进线屏开关合闸状态',
- switch_open_1st_2500A = (int) res.getValue(1); //'1号2500A进线屏开关分闸状态',
- switch_fault_1st_2500A = (int) res.getValue(2); //'1号2500A进线屏开关故障状态',
- switch_close_2st_2500A = (int) res.getValue(3); //'2号2500A进线屏开关合闸状态',
- switch_open_2st_2500A = (int) res.getValue(4); //'2号2500A进线屏开关分闸状态',
- switch_fault_2st_2500A = (int) res.getValue(5); //'2号2500A进线屏开关故障状态',
- switch_close_bus_screen = (int) res.getValue(6); //'母联屏合闸状态',
- switch_open_bus_screen = (int) res.getValue(7); //'母联屏分闸状态',
- switch_fault_bus_screen = (int) res.getValue(8); //'母联屏开关故障',
- switch_close_1st_2500A_load = (int) res.getValue(9); //'1号2500A负载屏开关合闸状态',
- switch_open_1st_2500A_load = (int) res.getValue(10); //'1号2500A负载屏开关分闸状态',
- switch_fault_1st_2500A_load = (int) res.getValue(11); //'1号2500A负载屏开关故障状态',
- switch_close_2st_2500A_load = (int) res.getValue(12); //'2号2500A负载屏开关合闸状态',
- switch_open_2st_2500A_load = (int) res.getValue(13); //'2号2500A负载屏开关分闸状态',
- switch_fault_2st_2500A_load = (int) res.getValue(14); //'2号2500A负载屏开关故障状态',
- curr_a = (float)res.getValue(15); //'A排电流',
- vol_a = (float)res.getValue(16); //'A排电压',
- curr_b = (float)res.getValue(17); //'B排电流',
- vol_b = (float)res.getValue(18); //'B排电压',
+ switch_close_1st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(0)); //'1号2500A进线屏开关合闸状态',
+ switch_open_1st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(1)); //'1号2500A进线屏开关分闸状态',
+ switch_fault_1st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(2)); //'1号2500A进线屏开关故障状态',
+ switch_close_2st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(3)); //'2号2500A进线屏开关合闸状态',
+ switch_open_2st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(4)); //'2号2500A进线屏开关分闸状态',
+ switch_fault_2st_2500A = MyModbusUtils.readBooleanToInt(res.getValue(5)); //'2号2500A进线屏开关故障状态',
+ switch_close_bus_screen = MyModbusUtils.readBooleanToInt(res.getValue(6)); //'母联屏合闸状态',
+ switch_open_bus_screen = MyModbusUtils.readBooleanToInt(res.getValue(7)); //'母联屏分闸状态',
+ switch_fault_bus_screen = MyModbusUtils.readBooleanToInt(res.getValue(8)); //'母联屏开关故障',
+ switch_close_1st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(9)); //'1号2500A负载屏开关合闸状态',
+ switch_open_1st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(10)); //'1号2500A负载屏开关分闸状态',
+ switch_fault_1st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(11)); //'1号2500A负载屏开关故障状态',
+ switch_close_2st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(12)); //'2号2500A负载屏开关合闸状态',
+ switch_open_2st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(13)); //'2号2500A负载屏开关分闸状态',
+ switch_fault_2st_2500A_load = MyModbusUtils.readBooleanToInt(res.getValue(14)); //'2号2500A负载屏开关故障状态',
+ curr_a = MyModbusUtils.readShortToFloat(res.getValue(15)); //'A排电流',
+ vol_a = MyModbusUtils.readShortToFloat(res.getValue(16)); //'A排电压',
+ curr_b = MyModbusUtils.readShortToFloat(res.getValue(17)); //'B排电流',
+ vol_b = MyModbusUtils.readShortToFloat(res.getValue(18)); //'B排电压',
}
}
--
Gitblit v1.9.1