From a0b185043d5a2a710d976acb8c59d3445a836320 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期五, 23 十一月 2018 16:31:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java | 42 +++++++++++++++++++++++++++++++++++++-----
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 6 +++++-
2 files changed, 42 insertions(+), 6 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 72ca0a6..85977ab 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
@@ -818,7 +818,7 @@
String sql="select distinct dev_id,dev_alarmstate,dev_workstate,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum " +
" ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong" +
" ,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type " +
- " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FbsDeviceName " +
+ " ,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 " +
" from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +//,db_ram_db.tb_batt_rtstate
" where dev_workstate="+FBS9100_ComBase.DISCHARGE+" "+
@@ -868,6 +868,10 @@
fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
fstate.setDev_temp(rs.getFloat("dev_temp"));
fstate.setStationName(rs.getString("stationName"));
+ fstate.setStationName1(rs.getString("stationName1"));
+ fstate.setStationName2(rs.getString("stationName2"));
+ fstate.setStationName3(rs.getString("stationName3"));
+ fstate.setStationName5(rs.getString("stationName5"));
fstate.setDeviceName(rs.getString("FbsDeviceName"));
/*fstate.setOnline_vols(((Float)rs.getFloat("online_vol")).toString());
fstate.setGroup_vols(((Float)rs.getFloat("group_vol")).toString());
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
index 07321b1..0234b7d 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
@@ -36,6 +36,10 @@
private String group_vols;
private String group_currs;
private String stationName;//鏈烘埧鍚嶇О
+ private String stationName1;
+ private String stationName2;
+ private String stationName3;
+ private String stationName5;
private String deviceName;//璁惧鍚嶇О
private String note;
private Page page;//鍒嗛〉
@@ -291,6 +295,30 @@
public void setBatt_online_state(Integer batt_online_state) {
this.batt_online_state = batt_online_state;
}
+ public String getStationName1() {
+ return stationName1;
+ }
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
+ public String getStationName3() {
+ return stationName3;
+ }
+ public void setStationName3(String stationName3) {
+ this.stationName3 = stationName3;
+ }
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip
@@ -315,11 +343,14 @@
+ dev_rxnullerrcount + ", batt_online_state="
+ batt_online_state + ", online_vols=" + online_vols
+ ", group_vols=" + group_vols + ", group_currs=" + group_currs
- + ", stationName=" + stationName + ", deviceName=" + deviceName
- + ", note=" + note + ", page=" + page + ", dev_conresist="
- + dev_conresist + ", dev_concurr=" + dev_concurr
- + ", dev_condvoldp=" + dev_condvoldp + ", dev_condcurr="
- + dev_condcurr + ", dev_61850alarms=" + dev_61850alarms
+ + ", stationName=" + stationName + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + ", stationName5="
+ + stationName5 + ", deviceName=" + deviceName + ", note="
+ + note + ", page=" + page + ", dev_conresist=" + dev_conresist
+ + ", dev_concurr=" + dev_concurr + ", dev_condvoldp="
+ + dev_condvoldp + ", dev_condcurr=" + dev_condcurr
+ + ", dev_61850alarms=" + dev_61850alarms
+ ", dev_last_captest_stop_type=" + dev_last_captest_stop_type
+ "]";
}
@@ -327,4 +358,5 @@
+
}
--
Gitblit v1.9.1