From cea36d9bcd04524f2e31fe4c35beabcbf5459ca7 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:25:52 +0800
Subject: [PATCH] 手机 机房历史事件查询(未包括详情及详情按钮)

---
 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 a79ee00..a4e6832 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 where dfu_en=true)  ";
 		//鏉′欢
-		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;
@@ -296,16 +296,16 @@
 	for (BattInf binf : listAll) {
 		System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
 	}*/
-	/*
+	
 	boolean bl=fimpl.addPro(binf);
-	System.out.println(bl);*/
+	System.out.println(bl);
 	/*List<BattInf> listAll=fimpl.serchInserStation(binf);
 	for (BattInf b : listAll) {
 		System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
 	}*/
-	List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
+	/*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
 	for (Fbs9100s_dfu_state dfu : listAll) {
 		System.out.println(dfu);
-	}
+	}*/
 }
 }

--
Gitblit v1.9.1