BattMonitor_FBS9600SMore/src/com/battmonitor/data/BattData_RT.java
@@ -1,6 +1,7 @@ package com.battmonitor.data; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import com.battmonitor.base.AppParam; import com.battmonitor.base.ComBase; @@ -78,6 +79,8 @@ private float mDataHistoryNewLevel = (float) 0.01; private int mTestDataRecordCountMax = 10000; public Date conn_time = new Date(0); //当前通讯时间 /*********************************************************************************/ /*********************************************************************************/ public BattData_RT(AppParam param, MysqlConnPool pool) @@ -129,15 +132,13 @@ { ArrayList<BattAlarmData> al_alm_data = new ArrayList<BattAlarmData>(); //Date timetime = new Date(100,0,1); Calendar c = Calendar.getInstance(); c.set(2000, 0, 1, 0, 0, 0); // if(TestData.recordTime.before(c.getTime())){ // //System.out.println(Com.getDateTimeFormat(TestData.recordTime, Com.DTF_YMDhms)+"<"+Com.getDateTimeFormat(timetime, Com.DTF_YMDhms)); // return al_alm_data; // } //判断设备是否通讯正常,通讯不正常则部检测电池组告警 Date now = new Date(); long timelong = (now.getTime()-conn_time.getTime())/1000; //判断设备是否通讯正常,通讯不正常不部检测电池组告警 //System.out.println("timelong:"+timelong); if(timelong > 60) { return al_alm_data; } for(int n=0; n<al_MonVol.size(); n++) { BattMonitor_FBS9600SMore/src/com/dev_fbs9600s/data/FBS9600S_BattAlarm_Thread.java
@@ -62,23 +62,23 @@ } BattData_RT rt_data = batts.getItem(i); al_alm = rt_data.makeAlarmData(); System.err.println("电池告警个数:"+al_alm.size()+""); //System.err.println("电池告警个数:"+al_alm.size()+""); for(int cnt=0; cnt<al_alm.size(); cnt++) { FBS9600S_BattAlarm_Thread_SQL.insertOrUpdateBattAlarmDataToTable(pool, al_alm.get(cnt)); } al_alm.clear(); for(int k = 0;k<rt_data.al_MonVol.size();k++) { rt_data.al_MonVol.get(k).monVol += Math.random(); //System.out.println(k+"=="+rt_data.al_MonVol.get(k).monVol); rt_data.al_MonVol.get(k).monTmp += Math.random(); rt_data.al_MonVol.get(k).monRes += Math.random(); } // for(int k = 0;k<rt_data.al_MonVol.size();k++) { // rt_data.al_MonVol.get(k).monVol += Math.random(); // //System.out.println(k+"=="+rt_data.al_MonVol.get(k).monVol); // rt_data.al_MonVol.get(k).monTmp += Math.random(); // rt_data.al_MonVol.get(k).monRes += Math.random(); // } } List<BattAlarmData> alarms = FBS9600S_BattAlarm_Thread_SQL.searchAllHistAlarmFromReal(pool); //查询电池实时告警表中的电池历史告警记录 if(alarms.size() >0) { System.out.println("告警消失数目"+alarms.size()); //System.out.println("告警消失数目"+alarms.size()); for(int i =0 ;i<alarms.size();i++) { FBS9600S_BattAlarm_Thread_SQL.checkBattAlarmData(pool,alarms.get(i)); //删除之前的告警记录,并存入历史告警表中 } BattMonitor_FBS9600SMore/src/com/dev_fbs9600s/data/FBS9600S_BattAlarm_Thread_SQL.java
@@ -99,7 +99,7 @@ alarms.add(alarm); //System.out.println(alarm.record_id); } System.out.println("历史实时告警数:"+alarms.size()+"##################"); //System.out.println("历史实时告警数:"+alarms.size()+"##################"); if(alarms.size()>0) { for(int i=0;i<alarms.size();i++) { alarm = alarms.get(i); BattMonitor_FBS9600SMore/src/com/dev_fbs9600s/data/FBS9600S_SocketClient_Thread_New.java
@@ -472,9 +472,11 @@ public void getFBS9600SMonData(float[] monData,int dataType,int start,int count,int arr_index) { int mon_index = 0; int mon_count = 0; for(int n=0;n<FBS9600S_ComBase.BattGroupCountMax;n++) { if(BattData_RT[n] != null) { for(int k =0;k<BattData_RT[n].al_MonVol.size();k++) { BattData_RT[n].conn_time = new Date(); //更新通讯时间 if((mon_index+BattData_RT[n].MonCount)<start) { mon_index += BattData_RT[n].MonCount; break;
