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/ram/Fbs9100_stateImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 d51b0dd..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) {
--
Gitblit v1.9.1