From 24f00a9a630ae03c1801aafe08ab13ddb1332da2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 11:20:49 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 15 +++------------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
index c73a44a..6d42ff8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
index 7f58652..018583b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
Binary files differ
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 b14a626..7c6ce27 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
@@ -896,7 +896,7 @@
+ ",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.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5 "
- + ",db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.BattGroupId "
+ + ",db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.BattGroupId,db_battinf.tb_battinf.battgroupname "
+ " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr "
+ " where dev_workstate="+FBS9100_ComBase.DISCHARGE
+ " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id "
@@ -914,21 +914,11 @@
while(rs.next()){
Fbs9100_state fstate=new Fbs9100_state();
int dev_alarmstate=rs.getInt("dev_alarmstate");
- String ContactorState="寮�鍏抽棴鍚�";
- if(dev_alarmstate==1 ||
- dev_alarmstate==2 ||
- dev_alarmstate==3 ||
- dev_alarmstate==4 ||
- dev_alarmstate==6 ){
- ContactorState="寮�鍏虫柇寮�";
- }else{
- ContactorState="寮�鍏抽棴鍚�";
- }
+
fstate.setDev_testgroupnum(rs.getInt("dev_testgroupnum")); //琚祴鐢垫睜缁勫彿
fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));
fstate.setDev_res_test_state(rs.getInt("dev_res_test_state"));
fstate.setDev_testtype(rs.getInt("dev_testtype"));
- fstate.setNote(ContactorState);
fstate.setDev_workstate(rs.getInt("dev_workstate"));
fstate.setDev_id(rs.getInt("dev_id"));
fstate.setDev_version(rs.getString("dev_version"));
@@ -952,6 +942,7 @@
fstate.setStationName5(rs.getString("stationName5"));
fstate.setBattgroupid(rs.getInt("battgroupid"));
fstate.setMonvolstd(rs.getInt("monvolstd"));
+ fstate.setNote(rs.getString("battgroupname"));
list.add(fstate);
}
} catch (SQLException e) {
--
Gitblit v1.9.1