From b268b39629bcc2dfbac978b5c53b67db3b71a839 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 14:03:16 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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 b14a626..06b95ee 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,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.moncount "
+ " 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 "
@@ -905,7 +905,28 @@
+ " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id "
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? "
+ " and db_battinf.tb_battinf.MonVolStd=? ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getNum(),binf.getMonVolStd()}, new CallBack() {
+ //鏉′欢
+ String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" and stationname1=? ";//鐪�
+ String sql2=" and stationname2=? ";//甯�
+ String sql5=" and stationname5=? ";//鍖哄幙
+ switch (binf.getNum()) {
+ case 0:
+ sql+=sql0;
+ break;
+ case 1:
+ sql+=sql1;
+ break;
+ case 2:
+ sql+=sql2;
+ break;
+ case 5:
+ sql+=sql5;
+ break;
+ default:
+ return null;
+ }
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getBattGroupId(),binf.getMonVolStd(),binf.getStationName()}, new CallBack() {
@Override
public List getResults(ResultSet rs) {
@@ -914,21 +935,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 +963,9 @@
fstate.setStationName5(rs.getString("stationName5"));
fstate.setBattgroupid(rs.getInt("battgroupid"));
fstate.setMonvolstd(rs.getInt("monvolstd"));
+ fstate.setMoncapstd(rs.getInt("moncapstd"));
+ fstate.setMoncount(rs.getInt("moncount"));
+ fstate.setNote(rs.getString("battgroupname"));
list.add(fstate);
}
} catch (SQLException e) {
@@ -980,8 +994,10 @@
p.setPageCurr(1);
fs.setPage(p);
BattInf binf=new BattInf();
- binf.setNum(1002);
- binf.setMonVolStd(12f);
+ binf.setNum(1);
+ binf.setBattGroupId(1002);
+ binf.setStationName("骞胯タ鐪�");
+ binf.setMonVolStd(2f);
/*List<Fbs9100_state> list=fi.serchByCondition(fs);
System.out.println(list.size());
for(Fbs9100_state f:list){
--
Gitblit v1.9.1