From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 8554514..cfae510 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
@@ -4,6 +4,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
@@ -413,7 +414,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,dev_commcount,dev_errcommcount from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
+ String sql="select dev_id,dev_version,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) {
@@ -432,6 +433,7 @@
}else{
ContactorState="寮�鍏抽棴鍚�";
}
+ fstate.setDev_version(rs.getString("dev_version"));
fstate.setRecord_datetime(rs.getString("record_datetime"));
fstate.setDev_testgroupnum(rs.getInt("dev_testgroupnum")); //琚祴鐢垫睜缁勫彿
fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
@@ -450,6 +452,7 @@
fstate.setBatt_online_state(rs.getInt("batt_online_state"));
fstate.setDev_commcount(rs.getInt("dev_commcount"));
fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
+ fstate.setNote(DAOHelper.sdf.format(new Date()));
list.add(fstate);
}
} catch (SQLException e) {
@@ -988,7 +991,7 @@
" ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong,dev_commcount" +
" ,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type " +
" ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FbsDeviceName " +
- " ,db_ram_db.tb_batt_rtstate.batt_test_tlong " +//,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol
+ " ,db_ram_db.tb_batt_rtstate.batt_test_tlong,db_ram_db.tb_batt_rtstate.online_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.batt_test_cap " +
" from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf ,db_ram_db.tb_batt_rtstate"+
" where db_battinf.tb_battinf.battgroupid=? "+
" and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id " +
@@ -1018,12 +1021,13 @@
fstate.setNote(ContactorState);
fstate.setDev_workstate(rs.getInt("dev_workstate"));
fstate.setDev_id(rs.getInt("dev_id"));
-
- 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"));
+ //杩欎簲涓弬鏁伴兘鏄痓att_rtstate涓殑鏁版嵁
+ fstate.setDev_captest_onlinevol(rs.getFloat("online_vol"));
+ fstate.setDev_captest_groupvol(rs.getFloat("group_vol"));
+ fstate.setDev_captest_curr(rs.getFloat("group_curr"));
+ fstate.setDev_captest_cap(rs.getFloat("batt_test_cap"));
fstate.setDev_captest_timelong(rs.getInt("batt_test_tlong"));//瀹為檯鏀剧數鏃跺父
+
fstate.setDev_commcount(rs.getInt("dev_commcount"));
fstate.setDev_conresist(rs.getFloat("dev_conresist"));
fstate.setDev_concurr(rs.getFloat("dev_concurr"));
--
Gitblit v1.9.1