From bcb7a41f9f4114f0734bd1ef25b0a20eaeb211fe Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 17:10:50 +0800
Subject: [PATCH] 111
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 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 fc17d26..05523fb 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,21 +24,21 @@
//鍗囩骇鎻掑叆
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_file_len) 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_file_len()});
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 " +
- " where ";
+ 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=" stationid=? "; //鍏蜂綋鏈烘埧
- String sql1=" stationname1=? ";//鐪�
- String sql2=" stationname2=? ";//甯�
- String sql5=" stationname5=? ";//鍖哄幙
+ String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" and stationname1=? ";//鐪�
+ String sql2=" and stationname2=? ";//甯�
+ String sql5=" and stationname5=? ";//鍖哄幙
switch (binf.getNum()) {
case 0:
sql+=sql0;
@@ -65,10 +65,10 @@
String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
" where ";
//鏉′欢
- String sql0=" stationid=? "; //鍏蜂綋鏈烘埧
- String sql1=" stationname1=? ";//鐪�
- String sql2=" stationname2=? ";//甯�
- String sql5=" stationname5=? ";//鍖哄幙
+ String sql0=" stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" stationname1=? ";//鐪�
+ String sql2=" stationname2=? ";//甯�
+ String sql5=" stationname5=? ";//鍖哄幙
switch (binf.getNum()) {
case 0:
sql+=sql0;
@@ -189,7 +189,9 @@
}
//鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
public List searchAll() {
- String sql=" select * from db_ram_db.tb_fbs9100s_dfu_state where dfu_en=1";
+ 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";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
public List getResults(ResultSet rs) {
@@ -206,7 +208,11 @@
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_file_len(rs.getInt("dfu_file_len"));
dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
+ dfu.setStationName(rs.getString("stationName"));
+ dfu.setStationId(rs.getString("stationId"));
+ dfu.setfBSDeviceName(rs.getString("fBSDeviceName"));
list.add(dfu);
}
} catch (SQLException e) {
@@ -256,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_file_len(rs.getInt("dfu_file_len"));
dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
list.add(dfu);
}
@@ -269,8 +276,8 @@
return listAll;
}
+ //鍗囩骇鐣岄潰鐐瑰嚮娣诲姞鐨勬椂鍊欐煡璇㈠嚭璁惧瀵瑰簲鐨勭増鏈彿
public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
return null;
}
public static void main(String[] args) {
@@ -291,16 +298,16 @@
for (BattInf binf : listAll) {
System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
}*/
- /*
+
boolean bl=fimpl.addPro(binf);
- System.out.println(bl);*/
+ System.out.println(bl);
/*List<BattInf> listAll=fimpl.serchInserStation(binf);
for (BattInf b : listAll) {
System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
}*/
- List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
+ /*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
for (Fbs9100s_dfu_state dfu : listAll) {
System.out.println(dfu);
- }
+ }*/
}
}
--
Gitblit v1.9.1