From 1b0f42c11f7573e56cc85551b762367f3d5da9cc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期三, 24 十月 2018 10:15:17 +0800
Subject: [PATCH] 拓扑图开关状态batt_online_state
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
index 848926e..7f7d86f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -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 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 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) {
@@ -379,6 +379,7 @@
fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
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"));
list.add(fstate);
}
} catch (SQLException e) {
@@ -394,7 +395,7 @@
public List serchByInfo(Object obj) {
BattInf binf=(BattInf) obj;
String sql="select fbs_rt.BattGroupId,fbs_rt.group_curr,fbs_rt.group_vol,fbs_rt.online_vol,fbs_rt.batt_state,fbs_rt.batt_test_type" +
- ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type " +
+ ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,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," +
"(select distinct db_ram_db.tb_batt_rtstate.BattGroupId,group_curr,group_vol,online_vol,batt_state,batt_test_type,db_battinf.tb_battinf.FBSDeviceId from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " +
"where db_battinf.tb_battinf.BattGroupId=db_ram_db.tb_batt_rtstate.BattGroupId " +
@@ -439,6 +440,7 @@
fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
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"));
list.add(fstate);
}
} catch (SQLException e) {
--
Gitblit v1.9.1