DELL
2025-03-02 07ad569203fbf199aaf37f83dbee298f1adad5a9
BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT.java
@@ -411,9 +411,11 @@
         //System.out.println(Com.getDateTimeFormat(TestData.recordTime, Com.DTF_YMDhms)+"<"+Com.getDateTimeFormat(timetime, Com.DTF_YMDhms));
         return al_alm_data;
      }
      if((FBSDeviceId/100000 == 6185 && dev_workstate != IEC61850_SYS_STATE_DISCHARGING) || (FBSDeviceId/100000 != 6185)) {
      //System.out.println("2222222222222="+dev_workstate);
      if((FBSDeviceId/1000000 == 618 && (!(dev_workstate == IEC61850_SYS_STATE_DISCHARGING || dev_workstate == IEC61850_SYS_STATE_CHARGING))) || (FBSDeviceId/1000000 != 618)) {
         TestData.onlineVol_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_OnlineVol, TestData.onlineVol);
         TestData.groupVol_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_GroupVol, TestData.groupVol);
         //System.out.println("检测组端电压");
      }
      
      
@@ -431,8 +433,10 @@
      {
         MonVolData vol_data = al_MonVol.get(n);
         
         if((FBSDeviceId/100000 == 6185 && dev_workstate != IEC61850_SYS_STATE_DISCHARGING) || (FBSDeviceId/100000 != 6185)) {
         if((FBSDeviceId/1000000 == 618 && (!(dev_workstate == IEC61850_SYS_STATE_DISCHARGING || dev_workstate == IEC61850_SYS_STATE_CHARGING))) || (FBSDeviceId/1000000 != 618)) {
            vol_data.monVol_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_MonVol, vol_data.monVol);
            //System.out.println("检测单体电压");
         }
         if(TestData.testCurr < 0) {            
            vol_data.dischargeMonVol_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_DischargeMonVol, vol_data.monVol);
@@ -449,12 +453,12 @@
//      }
      
      //System.out.println("超时时间:" + outtimelong + " FBSDeviceId:"+FBSDeviceId +"-"+(FBSDeviceId/100000 != 6185));
      if(outtimelong<60 && (FBSDeviceId/100000 != 6185)) {
//      if(outtimelong<60 && (FBSDeviceId/100000 != 6185)) {
         //System.out.println("更新数据。。。");
         //61850设备不用更新  'db_ram_db.tb_batt_rtalarm'表 和'db_ram_db.tb_batt_rsalarm'
         BattAlarm_Thread_SQL.updateBattRtState_Table(pool, this);
         BattAlarm_Thread_SQL.updateBattAlarm_RT_RamDB_Table(pool, this);
      }
//      }
      return al_alm_data;
   }