From adce89a1962119903c6c6ae10f1b7483291bba0b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 09:18:48 +0800
Subject: [PATCH] 文件升级修改
---
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java | 10 +++++++++-
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 21 ++++++++++++++++-----
2 files changed, 25 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 299953a..d8d0327 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
@@ -106,6 +106,7 @@
binf.setStationName5(rs.getString("stationName5"));
binf.setStationId(rs.getString("stationId"));
binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
+ binf.setStationIp(rs.getString("dev_version"));
list.add(binf);
}
} catch (SQLException e) {
@@ -193,9 +194,13 @@
}
//鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
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,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";
+ String sql=" select distinct db_ram_db.tb_fbs9100s_dfu_state.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 " +
+ ",db_ram_db.tb_fbs9100_state.dev_version" +
+ " from db_ram_db.tb_fbs9100s_dfu_state,db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state " +
+ " where db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
+ " and db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_ram_db.tb_fbs9100_state.dev_id " +
+ " and dfu_en=1";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
public List getResults(ResultSet rs) {
@@ -217,6 +222,7 @@
dfu.setStationName(rs.getString("stationName"));
dfu.setStationId(rs.getString("stationId"));
dfu.setfBSDeviceName(rs.getString("fBSDeviceName"));
+ dfu.setNote(rs.getString("dev_version"));
list.add(dfu);
}
} catch (SQLException e) {
@@ -304,14 +310,19 @@
/*boolean bl=fimpl.addPro(binf);
System.out.println(bl);*/
- List<BattInf> listAll=fimpl.serchInserStation(binf);
+ /*List<BattInf> listAll=fimpl.serchInserStation(binf);
for (BattInf b : listAll) {
System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
}
- System.out.println(listAll.size());
+ System.out.println(listAll.size());*/
/*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
for (Fbs9100s_dfu_state dfu : listAll) {
System.out.println(dfu);
}*/
+ List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
+ for (Fbs9100s_dfu_state dfu : listAll) {
+ System.out.println(dfu);
+ }
+ System.out.println(listAll.size());
}
}
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 356a85f..8269888 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
@@ -20,6 +20,8 @@
private String stationName;
private String stationId;
private String fBSDeviceName;
+
+ private String note;
public int getNum() {
return num;
}
@@ -116,6 +118,12 @@
public void setDfu_file_len(int dfu_file_len) {
this.dfu_file_len = dfu_file_len;
}
+ public String getNote() {
+ return note;
+ }
+ public void setNote(String note) {
+ this.note = note;
+ }
@Override
public String toString() {
return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -127,7 +135,7 @@
+ ", dfu_file_len=" + dfu_file_len + ", dfu_data_blocklen="
+ dfu_data_blocklen + ", dfu_password=" + dfu_password
+ ", stationName=" + stationName + ", stationId=" + stationId
- + ", fBSDeviceName=" + fBSDeviceName + "]";
+ + ", fBSDeviceName=" + fBSDeviceName + ", note=" + note + "]";
}
--
Gitblit v1.9.1