From fa86ff989e88bdecaef55a77850313c815665148 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.32>
Date: 星期四, 15 十一月 2018 09:40:21 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..a79ee00 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
@@ -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 " +
+ " 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) {
@@ -207,6 +209,9 @@
dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
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) {
--
Gitblit v1.9.1