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/dto/ram/Fbs9100s_dfu_state.java | 28 ++++++++++++++++++++++++++--
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 7 ++++++-
2 files changed, 32 insertions(+), 3 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) {
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 88a0f4d..83b381f 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
@@ -15,6 +15,10 @@
private int dfu_data_blocknum;
private int dfu_data_blocklen;
private String dfu_password;
+
+ private String stationName;
+ private String stationId;
+ private String fBSDeviceName;
public int getNum() {
return num;
}
@@ -87,6 +91,24 @@
public void setDfu_password(String dfu_password) {
this.dfu_password = dfu_password;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationId() {
+ return stationId;
+ }
+ public void setStationId(String stationId) {
+ this.stationId = stationId;
+ }
+ public String getfBSDeviceName() {
+ return fBSDeviceName;
+ }
+ public void setfBSDeviceName(String fBSDeviceName) {
+ this.fBSDeviceName = fBSDeviceName;
+ }
@Override
public String toString() {
return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -96,8 +118,10 @@
+ dfu_file + ", dfu_en=" + dfu_en + ", dfu_wr_stat="
+ dfu_wr_stat + ", dfu_data_blocknum=" + dfu_data_blocknum
+ ", dfu_data_blocklen=" + dfu_data_blocklen
- + ", dfu_password=" + dfu_password + "]";
+ + ", dfu_password=" + dfu_password + ", stationName="
+ + stationName + ", stationId=" + stationId + ", fBSDeviceName="
+ + fBSDeviceName + "]";
}
-
+
}
--
Gitblit v1.9.1