DELL
2024-02-21 4982b9614516dde101c3e44c60a612b3bfd8d6fe
iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java
@@ -101,7 +101,7 @@
               mon_cnt = 0;
            }
            boolean batt_group_exist = false;
            String reg_code = res.getString("BattGroupName6").trim();
            //String reg_code = res.getString("BattGroupName6").trim();
            float float_vol_lev = res.getFloat("FloatVolLevel");
            float float_curr_lev = res.getFloat("BattFloatCurrent");
            int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
@@ -115,10 +115,10 @@
               BattData_RT brt = Data_Array.get(n);
               if(bg_id == brt.BattGroupId) {
                  boolean param_changed = false;
                  if(false == reg_code.equals(brt.getDevRegCode())) {
                     brt.setDevRegCode(reg_code);
                     param_changed = true;
                  }
//                  if(false == reg_code.equals(brt.getDevRegCode())) {
//                     brt.setDevRegCode(reg_code);
//                     param_changed = true;
//                  }
                  if((float_vol_lev!=brt.getBattFloatVolLev()) || (float_curr_lev!=brt.getBattFloatCurrLev())) {
                     brt.setBattFloatVolCurrLevel(float_vol_lev, float_curr_lev);
                     param_changed = true;
@@ -152,7 +152,7 @@
               rtdata.FBSDeviceId = res.getInt("FBSDeviceId");
               rtdata.FBSDeviceIp = res.getString("FBSDeviceIp").trim();
               rtdata.FBSDeviceName = res.getString("FBSDeviceName").trim();
               rtdata.setDevRegCode(res.getString("BattGroupName6").trim());
               //rtdata.setDevRegCode(res.getString("BattGroupName6").trim());
               rtdata.GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");
               if(rtdata.GroupIndexInFBSDevice > 3) {
                  rtdata.GroupIndexInFBSDevice = 3;