From 5eddbbc5a04342f64fc7dddedff3271d8b7bf679 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 11:51:16 +0800
Subject: [PATCH] 升级加dfu_data_blocksum文件总数
---
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java | 8 ++++++++
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 14 ++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
index a4e6832..a471494 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
+++ b/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;
}
- //鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊tationName涓�)
+ //鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊tationName涓�,鏂囦欢澶у皬鐨勫�兼斁鍦╪um涓�)
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);
}
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
index 83b381f..ee5a3d4 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
+++ b/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="
--
Gitblit v1.9.1