From 9ed73aefac23e89305bab89cb79c7f865dabee4c Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.32>
Date: 星期四, 15 十一月 2018 10:55:30 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..9ccab08 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
@@ -33,12 +33,12 @@
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 ";
+ " where fBSDeviceId not in(select DISTINCT dev_id from db_ram_db.tb_fbs9100s_dfu_state) ";
//鏉′欢
- 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 " +
+ " 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