From 12e9ba156bb74248258e78e4a6ecaf89518010b6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 28 十一月 2018 16:44:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..2f40874 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.getSize()+" 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);
}
@@ -274,8 +276,8 @@
return listAll;
}
+ //鍗囩骇鐣岄潰鐐瑰嚮娣诲姞鐨勬椂鍊欐煡璇㈠嚭璁惧瀵瑰簲鐨勭増鏈彿
public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
return null;
}
public static void main(String[] args) {
--
Gitblit v1.9.1