升级修改

hdw

2018-11-14 b277552000ca51181b2f8ad1031f232bea9aee6f

升级修改

 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java

@@ -116,7 +116,7 @@
    //批量升级前验证升级的设备必须处于在线监测状态(9100state的workstate为0)

    public List judgeStation(Object obj){

        List<Integer> list=(List<Integer>) obj;

        String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +

        String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  " +

                " where db_ram_db.tb_fbs9100_state.dev_id=db_battinf.tb_battinf.fBSDeviceId  and dev_workstate=0 and dev_id in(";

        String devSql="";

        Object[] object=new Object[list.size()];

@@ -142,6 +142,7 @@
                    while(rs.next()){

                        BattInf binf=new BattInf();

                        binf.setFBSDeviceId(rs.getInt("dev_id"));

                        binf.setStationName(rs.getString("stationName"));

                        binf.setStationName3(rs.getString("stationName3"));

                        list.add(binf);

                    }