Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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) {

@@ -907,10 +910,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,10 +988,10 @@
       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 
                " ,db_ram_db.tb_batt_rtstate.batt_test_tlong,db_ram_db.tb_batt_rtstate.online_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.batt_test_cap " +

                " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  ,db_ram_db.tb_batt_rtstate"+

                " where  db_battinf.tb_battinf.battgroupid=? "+

                " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  " +

@@ -1018,13 +1021,14 @@
                     fstate.setNote(ContactorState);

                     fstate.setDev_workstate(rs.getInt("dev_workstate"));

                     fstate.setDev_id(rs.getInt("dev_id"));

							
                     fstate.setDev_captest_onlinevol(rs.getFloat("dev_captest_onlinevol"));

                     fstate.setDev_captest_groupvol(rs.getFloat("dev_captest_groupvol"));

                     fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));

                     fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));

                     //这五个参数都是batt_rtstate中的数据

                     fstate.setDev_captest_onlinevol(rs.getFloat("online_vol"));

                     fstate.setDev_captest_groupvol(rs.getFloat("group_vol"));

                     fstate.setDev_captest_curr(rs.getFloat("group_curr"));

                     fstate.setDev_captest_cap(rs.getFloat("batt_test_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 +1042,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);

                  }