DyEnvir_system/src/com/fgkj/actions/CsvFileDownloadAction.java
@@ -8,8 +8,10 @@ import com.fgkj.dao.CsvUtil; import com.fgkj.dao.UinfDaoFactory; import com.fgkj.dao.impl.Batt_realdataImpl; import com.fgkj.dao.impl.BattcurrdataImpl; import com.fgkj.dao.impl.BatttestdataDAOImpl; import com.fgkj.dto.Batt_realdata; import com.fgkj.dto.Battcurrdata; import com.fgkj.dto.Batttestdata; import com.fgkj.dto.CsvFile; @@ -120,6 +122,11 @@ cs.setStates(state); createFileCsv(cs,path); model=searchStationSource(cs,path); }else if(cs.getExport_num()==8){ String state="时间(HH:MM:SS),组端电压(V),在线电压(V),组端电流(A)"; cs.setStates(state); createFileCsv(cs,path); model=searchStationSource(cs,path); }else{ model.setCode(0); model.setMsg("导出文件页面匹配不上"); @@ -182,6 +189,11 @@ bcd.setBattGroupId(cs.getDev_id()); bcd.setTest_record_count(cs.getTest_record_count()); exportData=(new BattcurrdataImpl()).serchByInfo(bcd); }else if(cs.getExport_num()==8){ Batt_realdata brd=new Batt_realdata(); brd.setBattGroupId(cs.getDev_id()); brd.setRecord_time(cs.getRecord_time()); exportData=(new Batt_realdataImpl()).serchByInfo(brd); } if(exportData==null&&exportData.size()<=0){ Map row = new LinkedHashMap<String, String>(); DyEnvir_system/src/com/fgkj/dao/impl/Batt_realdataImpl.java
@@ -6,11 +6,13 @@ import java.util.Collections; import java.util.List; import com.fgkj.actions.ActionUtil; import com.fgkj.dao.BaseDAO; import com.fgkj.dao.CallBack; import com.fgkj.dao.DAOHelper; import com.fgkj.db.DBUtil; import com.fgkj.dto.Batt_realdata; import com.fgkj.electric2mwsystem.dto.Electric2mw_realdata; public class Batt_realdataImpl implements BaseDAO,CallBack{ @@ -76,11 +78,36 @@ }); return list; } //文件导出实时历史数据 @Override public List serchByInfo(Object obj) { // TODO Auto-generated method stub return null; Batt_realdata brd=(Batt_realdata) obj; String dataString=DAOHelper.sdfwithOut.format(brd.getRecord_time()); String sql=" select distinct group_vol,record_time,online_vol,group_curr " + " from db_batt_history.tb_batt_realdata_"+brd.getBattGroupId()+"_"+dataString.replace("-", "_")+" order by record_time asc "; List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() { @Override public List getResults(ResultSet rs) { List list=new ArrayList(); try { while(rs.next()){ List row=new ArrayList(); row.add(ActionUtil.chageDateToString(rs.getTimestamp("record_time"), ActionUtil.time_yyyyMMddHHmmss).trim()); row.add(rs.getFloat("group_vol")); row.add(rs.getFloat("online_vol")); row.add(rs.getFloat("group_curr")); list.add(row); } } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } return list; } }); return list; } } DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Device_connectstateImpl.java
@@ -78,7 +78,7 @@ switch (dc.getNum()) { case 1:table_schema="db_dynamicsystem";break;//负载 case 2:table_schema="db_motor_realhistory";break;//电机 case 3:table_schema="db_batt_history";break;//电池----暂时不用 case 8:table_schema="db_batt_history";break;//电池----电池放电3,突变7,历史实时8 case 4:table_schema="db_electricsystem";break;//4MW case 5:table_schema="db_watersystem";break;//水冷 case 6:table_schema="db_electric2mwsystem";break;//2MW