81041
2018-11-29 adce89a1962119903c6c6ae10f1b7483291bba0b
文件升级修改
2个文件已修改
31 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
@@ -106,6 +106,7 @@
                        binf.setStationName5(rs.getString("stationName5"));
                        binf.setStationId(rs.getString("stationId"));
                        binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
                        binf.setStationIp(rs.getString("dev_version"));
                        list.add(binf);
                    }
                } catch (SQLException e) {
@@ -193,9 +194,13 @@
    }
    //查询出所有处于升级的设备
    public List searchAll() {
        String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.fBSDeviceName,sysVersion_new,softVersion_new,sysVersion_dev,softVersion_dev,dfu_file,dfu_en,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocklen,dfu_file_len " +
                " from  db_ram_db.tb_fbs9100s_dfu_state,db_battinf.tb_battinf " +
                " where db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_battinf.tb_battinf.fBSDeviceId  and dfu_en=1";
        String sql=" select distinct db_ram_db.tb_fbs9100s_dfu_state.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.fBSDeviceName " +
                ",sysVersion_new,softVersion_new,sysVersion_dev,softVersion_dev,dfu_file,dfu_en,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocklen,dfu_file_len " +
                ",db_ram_db.tb_fbs9100_state.dev_version" +
                " from  db_ram_db.tb_fbs9100s_dfu_state,db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state " +
                " where db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_battinf.tb_battinf.fBSDeviceId  " +
                " and db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_ram_db.tb_fbs9100_state.dev_id " +
                " and dfu_en=1";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
            
            public List getResults(ResultSet rs) {
@@ -217,6 +222,7 @@
                        dfu.setStationName(rs.getString("stationName"));
                        dfu.setStationId(rs.getString("stationId"));
                        dfu.setfBSDeviceName(rs.getString("fBSDeviceName"));
                        dfu.setNote(rs.getString("dev_version"));
                        list.add(dfu);
                    }
                } catch (SQLException e) {
@@ -304,14 +310,19 @@
    
    /*boolean bl=fimpl.addPro(binf);
    System.out.println(bl);*/
    List<BattInf> listAll=fimpl.serchInserStation(binf);
    /*List<BattInf> listAll=fimpl.serchInserStation(binf);
    for (BattInf b : listAll) {
        System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
    }
    System.out.println(listAll.size());
    System.out.println(listAll.size());*/
    /*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
    for (Fbs9100s_dfu_state dfu : listAll) {
        System.out.println(dfu);
    }*/
    List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
    for (Fbs9100s_dfu_state dfu : listAll) {
        System.out.println(dfu);
    }
    System.out.println(listAll.size());
}
}
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
@@ -20,6 +20,8 @@
    private String stationName;
    private String stationId;
    private String fBSDeviceName;
    private String note;
    public int getNum() {
        return num;
    }
@@ -116,6 +118,12 @@
    public void setDfu_file_len(int dfu_file_len) {
        this.dfu_file_len = dfu_file_len;
    }
    public String getNote() {
        return note;
    }
    public void setNote(String note) {
        this.note = note;
    }
    @Override
    public String toString() {
        return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -127,7 +135,7 @@
                + ", dfu_file_len=" + dfu_file_len + ", dfu_data_blocklen="
                + dfu_data_blocklen + ", dfu_password=" + dfu_password
                + ", stationName=" + stationName + ", stationId=" + stationId
                + ", fBSDeviceName=" + fBSDeviceName + "]";
                + ", fBSDeviceName=" + fBSDeviceName + ", note=" + note + "]";
    }