81041
2018-11-28 5eddbbc5a04342f64fc7dddedff3271d8b7bf679
升级加dfu_data_blocksum文件总数
2个文件已修改
22 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
@@ -24,15 +24,15 @@
    //升级插入
    public boolean add(Object obj) {
        Fbs9100s_dfu_state dfu=(Fbs9100s_dfu_state) obj;
        String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum) values (?,?,?,?)";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum()});
        String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocksum) values (?,?,?,?,?)";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum(),dfu.getDfu_data_blocksum()});
        return bl;
    }
    //批量升级插入(所有属性传到stationName中)
    //批量升级插入(所有属性传到stationName中,文件大小的值放在num中)
    public boolean addPro(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum) " +
                " SELECT  DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1 FROM  db_battinf.tb_battinf " +
        String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocksum) " +
                " SELECT  DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1,"+binf.getNum()+"  FROM db_battinf.tb_battinf " +
                " where fBSDeviceId not in(select DISTINCT dev_id from db_ram_db.tb_fbs9100s_dfu_state where dfu_en=true)  ";
        //条件
        String sql0=" and stationid=? "; //具体机房
@@ -189,7 +189,7 @@
    }
    //查询出所有处于升级的设备
    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 " +
        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_data_blocksum " +
                " 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";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
@@ -208,6 +208,7 @@
                        dfu.setDfu_en(rs.getInt("dfu_en"));
                        dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
                        dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
                        dfu.setDfu_data_blocksum(rs.getInt("dfu_data_blocksum"));
                        dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
                        dfu.setStationName(rs.getString("stationName"));
                        dfu.setStationId(rs.getString("stationId"));
@@ -261,6 +262,7 @@
                        dfu.setDfu_en(rs.getInt("dfu_en"));
                        dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
                        dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
                        dfu.setDfu_data_blocksum(rs.getInt("dfu_data_blocksum"));
                        dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
                        list.add(dfu);
                    }
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
@@ -13,6 +13,7 @@
    private int dfu_en;
    private int dfu_wr_stat;
    private int dfu_data_blocknum;
    private int dfu_data_blocksum;
    private int dfu_data_blocklen;
    private String dfu_password;
    
@@ -109,6 +110,12 @@
    public void setfBSDeviceName(String fBSDeviceName) {
        this.fBSDeviceName = fBSDeviceName;
    }
    public int getDfu_data_blocksum() {
        return dfu_data_blocksum;
    }
    public void setDfu_data_blocksum(int dfu_data_blocksum) {
        this.dfu_data_blocksum = dfu_data_blocksum;
    }
    @Override
    public String toString() {
        return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -117,6 +124,7 @@
                + ", softVersion_dev=" + softVersion_dev + ", dfu_file="
                + dfu_file + ", dfu_en=" + dfu_en + ", dfu_wr_stat="
                + dfu_wr_stat + ", dfu_data_blocknum=" + dfu_data_blocknum
                + ", dfu_data_blocksum=" + dfu_data_blocksum
                + ", dfu_data_blocklen=" + dfu_data_blocklen
                + ", dfu_password=" + dfu_password + ", stationName="
                + stationName + ", stationId=" + stationId + ", fBSDeviceName="