From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
index 04cc247..bf8a5b3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
@@ -48,7 +48,7 @@
String sql="";
String numberSql=" SELECT FOUND_ROWS() number";
Connection conn=DBUtil.getConn();
- String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,state_change_reason,dev_alarm,stationName " +
+ String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,eve_type,module_num,state_change_reason,dev_alarm,stationName " +
" from db_app_sys.tb_fbsdev_statechange_inf,db_battinf.tb_battinf " +
" where db_app_sys.tb_fbsdev_statechange_inf.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
" and rec_time>? and rec_time<? ";
@@ -83,12 +83,15 @@
state_inf.setDev_id(rs.getInt("dev_id"));
state_inf.setRec_time(rs.getTimestamp("rec_time"));
state_inf.setLast_stat(rs.getInt("last_stat"));
- state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("last_stat")));
+ state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("last_stat")));
state_inf.setNow_stat(rs.getInt("now_stat"));
- state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("now_stat")));
+ state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("now_stat")));
state_inf.setState_change_reason(rs.getInt("state_change_reason"));
state_inf.setState_change_reason_name(BattTestData.getStopType(BattTestData.TEST_LOADER_FBS9100S, rs.getInt("state_change_reason")));
state_inf.setDev_alarm(rs.getInt("dev_alarm"));
+ state_inf.setEve_type(rs.getInt("eve_type"));
+ state_inf.setEve_type_name(BattTestData.getEve_type_name(rs.getInt("eve_type")));
+ state_inf.setModule_num(rs.getInt("module_num"));
state_inf.setNote(rs.getString("stationName"));
list.add(state_inf);
}
--
Gitblit v1.9.1