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 |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 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 9ccab08..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
@@ -24,16 +24,16 @@
     //鍗囩骇鎻掑叆
 	public boolean add(Object obj) {
 		Fbs9100s_dfu_state dfu=(Fbs9100s_dfu_state) obj;
-		String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum) values (?,?,?,?)";
-		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum()});
+		String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum,dfu_file_len) values (?,?,?,?,?)";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum(),dfu.getDfu_file_len()});
 		return bl;
 	}
-	//鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊tationName涓�)
+	//鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊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) " +
-				" SELECT  DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1 FROM  db_battinf.tb_battinf " +
-				" where fBSDeviceId not in(select DISTINCT dev_id from db_ram_db.tb_fbs9100s_dfu_state)  ";
+		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=? "; //鍏蜂綋鏈烘埧
 		String sql1=" and stationname1=? ";//鐪�
@@ -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()+"璁惧";
@@ -189,7 +193,7 @@
 	}
     //鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
 	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 " +
+		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";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
@@ -208,6 +212,7 @@
 						dfu.setDfu_en(rs.getInt("dfu_en"));
 						dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
 						dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
+						dfu.setDfu_file_len(rs.getInt("dfu_file_len"));
 						dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
 						dfu.setStationName(rs.getString("stationName"));
 						dfu.setStationId(rs.getString("stationId"));
@@ -261,6 +266,7 @@
 						dfu.setDfu_en(rs.getInt("dfu_en"));
 						dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
 						dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
+						dfu.setDfu_file_len(rs.getInt("dfu_file_len"));
 						dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
 						list.add(dfu);
 					}
@@ -275,7 +281,6 @@
 	}
    
 	public List serchByInfo(Object obj) {
-		// TODO Auto-generated method stub
 		return null;
 	}
     public static void main(String[] args) {
@@ -286,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) {
@@ -296,16 +301,17 @@
 	for (BattInf binf : listAll) {
 		System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
 	}*/
-	/*
-	boolean bl=fimpl.addPro(binf);
+	
+	/*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());
-	}*/
-	List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
+	}
+	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