From a86db2491e96752d04c5c6e6e7c0a7efdb80f014 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 09:08:15 +0800
Subject: [PATCH] 文件升级修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 05523fb..299953a 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
@@ -31,8 +31,8 @@
//鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊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,dfu_data_blocksum) " +
- " SELECT DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1,"+binf.getSize()+" FROM db_battinf.tb_battinf " +
+ String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_wr_stat,dfu_data_blocknum) " +
+ " SELECT DISTINCT fBSDeviceId,1,1 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=" and stationid=? "; //鍏蜂綋鏈烘埧
@@ -62,8 +62,12 @@
//琛ㄦ牸鏄剧ず鎵归噺鎻掑叆鐨勬満鎴夸俊鎭�
public List serchInserStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
- " where ";
+ String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 " +
+ ",db_ram_db.tb_fbs9100_state.dev_id,db_ram_db.tb_fbs9100_state.dev_version" +
+ " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state " +
+ " where db_battinf.tb_battinf.fBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id " +
+ " and db_battinf.tb_battinf.station_install=1 " +
+ " and ";
//鏉′欢
String sql0=" stationid=? "; //鍏蜂綋鏈烘埧
String sql1=" stationname1=? ";//鐪�
@@ -170,7 +174,7 @@
if(list!=null&&list.size()>0){
for (int i = 0; i < list.size(); i++) {
Fbs9100s_dfu_state dfu=list.get(i);
- String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1 where dev_id="+dfu.getDev_id();
+ String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1,dfu_file="+dfu.getDfu_file()+" where dev_id="+dfu.getDev_id();
sql_str.add(sql);
{
String msg="鍗囩骇"+dfu.getDev_id()+"璁惧";
@@ -276,7 +280,6 @@
return listAll;
}
- //鍗囩骇鐣岄潰鐐瑰嚮娣诲姞鐨勬椂鍊欐煡璇㈠嚭璁惧瀵瑰簲鐨勭増鏈彿
public List serchByInfo(Object obj) {
return null;
}
@@ -288,7 +291,7 @@
list.add(910000534);
BattInf binf=new BattInf();
binf.setNum(1);
- binf.setStationName("婀栧寳鐪�");
+ binf.setStationName("骞胯タ鐪�");
/*List<Fbs9100s_dfu_state> listAll=fimpl.serchByCondition(list);
for (Fbs9100s_dfu_state dfu : listAll) {
@@ -299,12 +302,13 @@
System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
}*/
- boolean bl=fimpl.addPro(binf);
- System.out.println(bl);
- /*List<BattInf> listAll=fimpl.serchInserStation(binf);
+ /*boolean bl=fimpl.addPro(binf);
+ System.out.println(bl);*/
+ List<BattInf> listAll=fimpl.serchInserStation(binf);
for (BattInf b : listAll) {
System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
- }*/
+ }
+ System.out.println(listAll.size());
/*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
for (Fbs9100s_dfu_state dfu : listAll) {
System.out.println(dfu);
--
Gitblit v1.9.1