~whychwj/haha.git

			@@ -64,7 +64,7 @@
			<div class="batt-state">

			<div class="list">
			<div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 机房停电数 -->
			<div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 机房停电数 -->
			</div>
			<div class="list">
			<div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div> <!-- 电池告警数 -->

			@@ -345,7 +345,7 @@
			//实时监测界面根据dev_alarmstate状态判断接触器状态
			public List serchContactorState(Object obj) {
			Fbs9100_state fs=(Fbs9100_state) obj;
			String sql="select dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
			String sql="select dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state,dev_commcount,dev_errcommcount from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
			List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fs.getDev_id()},new CallBack() {

			public List getResults(ResultSet rs) {
			@@ -380,6 +380,8 @@
			fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
			fstate.setDev_temp(rs.getFloat("dev_temp"));
			fstate.setBatt_online_state(rs.getInt("batt_online_state"));
			fstate.setDev_commcount(rs.getInt("dev_commcount"));
			fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
			list.add(fstate);
			}
			} catch (SQLException e) {

	gx_tieta/WebRoot/Top.jsp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史