修改

81041

2019-11-07 ea49f23572af4374d9c545d8a752cb780acfc031

修改

 Idce_Lithium/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java

@@ -1214,7 +1214,7 @@
    public List ser8KW_State(Object obj){
        Fbs9100_state fstate =(Fbs9100_state) obj;
        String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,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_errcommcount " +
                     " ,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   " +
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +
                     " where   "+
@@ -1249,6 +1249,8 @@
                          fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
                          fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
                          fstate.setDev_captest_timelong(rs.getInt("dev_captest_timelong"));
                          fstate.setDev_commcount(rs.getInt("dev_commcount"));
                          fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
                          
                          
                          fstate.setStationName(rs.getString("stationName"));
@@ -1271,11 +1273,12 @@
          return list;
        
    }
    //-----------------跨域--------导航上实时查询8KW处于放电测试的数据的设备
    //--------跨域------8KW获取设备实时状态(全部传0)
    public List ser8KW_State_ky(Object obj){
        Fbs9100_state fstate =(Fbs9100_state) obj;
        String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,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_errcommcount " +
                     " ,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   " +
                     " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +
                     " where   "+
@@ -1310,6 +1313,8 @@
                          fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
                          fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
                          fstate.setDev_captest_timelong(rs.getInt("dev_captest_timelong"));
                          fstate.setDev_commcount(rs.getInt("dev_commcount"));
                          fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
                          
                          
                          fstate.setStationName(rs.getString("stationName"));
@@ -1332,8 +1337,7 @@
          return list;
        
    }
    //-----------------跨域--------导航上实时查询8KW处于放电测试的数据的设备
      public List seachNuclear_cap_ky(){
          public List seachNuclear_cap_ky(){
          String sql="select distinct db_ram_db.tb_fbs9100_state.num,dev_id,dev_alarmstate,dev_workstate,record_datetime " +
                     " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong  " +
                     " ,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   " +