From 90c69565afd02dba9e79aff9de30b4ca322e5fb8 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 14:47:28 +0800
Subject: [PATCH] 线程启动
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 ea67d8e..8554514 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
@@ -907,10 +907,10 @@
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? "
+ " and db_battinf.tb_battinf.MonVolStd=? ";
//鏉′欢
- String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
- String sql1=" and stationname1=? ";//鐪�
- String sql2=" and stationname2=? ";//甯�
- String sql5=" and stationname5=? ";//鍖哄幙
+ String sql0=" and db_battinf.tb_battinf.stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" and db_battinf.tb_battinf.stationname1=? ";//鐪�
+ String sql2=" and db_battinf.tb_battinf.stationname2=? ";//甯�
+ String sql5=" and db_battinf.tb_battinf.stationname5=? ";//鍖哄幙
switch (binf.getNum()) {
case 0:
sql+=sql0;
@@ -985,7 +985,7 @@
for (int i = 0; i < list.size(); i++) {
BattInf binf=list.get(i);
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_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
@@ -1024,7 +1024,7 @@
fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
fstate.setDev_captest_cap(rs.getFloat("dev_captest_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"));
fstate.setDev_condcurr(rs.getFloat("dev_condcurr"));
@@ -1038,9 +1038,6 @@
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());
- fstate.setGroup_currs(((Float)rs.getFloat("group_curr")).toString());*/
list.add(fstate);
}
--
Gitblit v1.9.1