From 2b166df4e9c7111ef0937ff7d46c05692977446d Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期二, 18 二月 2025 14:46:21 +0800
Subject: [PATCH] V10.206 edit lijun at 2025-02-18 1.兼容1托4全功能假负载-这种类型设备需将电话号码字段修改位设备ICD文件-zjdy_zk-qgn_1T4.icd
---
iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java b/iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java
index a5db68b..26b2dcf 100644
--- a/iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java
+++ b/iec61852_forQGN/src/com/battdata_rt/BattData_RT_Array.java
@@ -83,7 +83,7 @@
sql.sqlMysqlUseDB(Sql_Mysql.DB_BATT_INF);
String sql_str = "SELECT DISTINCT "
- + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,comm_port,"
+ + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,comm_port,station_phone,"
+ " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"
+ " FROM " + Sql_Mysql.BattInf_Table
+ " WHERE FLOOR(FBSDeviceId/10000)=61852"
@@ -102,6 +102,8 @@
}
boolean batt_group_exist = false;
String reg_code = res.getString("BattGroupName6").trim();
+
+ String station_phone = res.getString("station_phone").trim();
String dev_ip = res.getString("FBSDeviceIp").trim();
float float_vol_lev = res.getFloat("FloatVolLevel");
float float_curr_lev = res.getFloat("BattFloatCurrent");
@@ -139,6 +141,12 @@
param_changed = true;
}
+ if(false == station_phone.equals(brt.icdName)) {
+ //鏇存柊icd鏂囦欢
+ brt.icdName = station_phone;
+ param_changed = true;
+ }
+
if(GroupIndexInFBSDevice != brt.GroupIndexInFBSDevice) {
brt.GroupIndexInFBSDevice = GroupIndexInFBSDevice;
param_changed = true;
@@ -171,6 +179,8 @@
rtdata.FBSDeviceName = res.getString("FBSDeviceName").trim();
rtdata.setDevRegCode(res.getString("BattGroupName6").trim());
rtdata.GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
+
+ rtdata.icdName = station_phone;
if(rtdata.GroupIndexInFBSDevice > 3) {
rtdata.GroupIndexInFBSDevice = 3;
}
--
Gitblit v1.9.1