~whyclxw/Idce_Lithium.git

			@@ -6,6 +6,7 @@
			import java.sql.SQLException;
			import java.util.ArrayList;
			import java.util.List;

			import sun.security.jca.GetInstance;

			import com.fgkj.dao.BaseDAO;
			@@ -13,6 +14,7 @@
			import com.fgkj.dao.CallBack;
			import com.fgkj.dao.DAOHelper;
			import com.fgkj.dao.FBS9100_ComBase;
			import com.fgkj.dao.Idce_8KW_State;
			import com.fgkj.dao.UinfDaoFactory;
			import com.fgkj.db.DBUtil;
			import com.fgkj.db.IDatabaseName;
			@@ -727,9 +729,12 @@
			",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr " +
			",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW " +
			",db_ram_db.tb_fbs9100_setparam.chargeCurrSet" +
			",db_ram_db.tb_fbs9100_setparam.dCVolHighLimit " +
			",db_ram_db.tb_fbs9100_setparam.dCVolHighLimit"
			+ ",db_ram_db.tb_fbs9100_state.dev_id,dev_alarmstate,dev_workstate,record_datetime " +
			" ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong,dev_commcount,dev_errcommcount " +
			" FROM db_battinf.tb_battinf " +
			" LEFT OUTER JOIN db_ram_db.tb_fbs9100_setparam on db_ram_db.tb_fbs9100_setparam.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
			" LEFT OUTER JOIN db_ram_db.tb_fbs9100_setparam on db_ram_db.tb_fbs9100_setparam.dev_id=db_battinf.tb_battinf.FBSDeviceId "
			+" LEFT OUTER JOIN db_ram_db.tb_fbs9100_state on db_ram_db.tb_fbs9100_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
			" WHERE db_battinf.tb_battinf.FBSDeviceId=? limit 1";

			List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fsparam.getDev_id()}, new CallBack() {
			@@ -758,6 +763,24 @@
			fsparam.setChargeCurrSet(rs.getFloat("chargeCurrSet"));
			fbs9100.setFsparam(fsparam);


			Fbs9100_state fstate=new Fbs9100_state();
			fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
			fstate.setStop_reason(Idce_8KW_State.get8KW_stopState(fstate.getDev_alarmstate()));//停止原因
			fstate.setDev_workstate(rs.getInt("dev_workstate"));
			fstate.setNote(Idce_8KW_State.get8KW_workState(fstate.getDev_workstate()));//当前设备状态
			fstate.setDev_id(rs.getInt("dev_id"));

			fstate.setRecord_datetime(rs.getString("record_datetime"));
			fstate.setDev_captest_onlinevol(rs.getFloat("dev_captest_onlinevol"));
			fstate.setDev_captest_groupvol(rs.getFloat("dev_captest_groupvol"));
			fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
			fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
			fstate.setDev_captest_timelong(rs.getInt("dev_captest_timelong"));
			fstate.setDev_commcount(rs.getInt("dev_commcount"));
			fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
			fbs9100.setFstate(fstate);

			list.add(fbs9100);
			}
			} catch (SQLException e) {
			@@ -777,7 +800,11 @@
			binf.setStationName("");
			binf.setStationName1("");
			binf.setBattGroupId(1002385);
			List<FBS9100> list=fi.serchByCondition_ky(binf);

			Fbs9100_setparam fparam=new Fbs9100_setparam();
			fparam.setDev_id(980000001);
			// List<FBS9100> list=fi.serchByCondition_ky(binf);
			List<FBS9100> list=fi.serchbyDev_id_8KW_ky(fparam);
			System.out.println(list.size());
			for(FBS9100 f:list){
			System.out.println(f);