From e24744ff8b8aaa16ec75f33dd67a31e8fb94979d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 14:48:22 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 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 be87a2a..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;
@@ -62,13 +62,13 @@
//琛ㄦ牸鏄剧ず鎵归噺鎻掑叆鐨勬満鎴夸俊鎭�
public List serchInserStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="SELECT DISTINCT fBSDeviceId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
+ 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;
@@ -100,6 +100,8 @@
binf.setStationName2(rs.getString("stationName2"));
binf.setStationName3(rs.getString("stationName3"));
binf.setStationName5(rs.getString("stationName5"));
+ binf.setStationId(rs.getString("stationId"));
+ binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
list.add(binf);
}
} catch (SQLException e) {
@@ -114,7 +116,7 @@
//鎵归噺鍗囩骇鍓嶉獙璇佸崌绾х殑璁惧蹇呴』澶勪簬鍦ㄧ嚎鐩戞祴鐘舵��(9100state鐨剋orkstate涓�0)
public List judgeStation(Object obj){
List<Integer> list=(List<Integer>) obj;
- String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +
+ String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname3 from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +
" where db_ram_db.tb_fbs9100_state.dev_id=db_battinf.tb_battinf.fBSDeviceId and dev_workstate=0 and dev_id in(";
String devSql="";
Object[] object=new Object[list.size()];
@@ -140,6 +142,7 @@
while(rs.next()){
BattInf binf=new BattInf();
binf.setFBSDeviceId(rs.getInt("dev_id"));
+ binf.setStationName(rs.getString("stationName"));
binf.setStationName3(rs.getString("stationName3"));
list.add(binf);
}
@@ -184,10 +187,41 @@
// TODO Auto-generated method stub
return false;
}
-
+ //鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
public List searchAll() {
- // TODO Auto-generated method stub
- return null;
+ 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) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Fbs9100s_dfu_state dfu=new Fbs9100s_dfu_state();
+ dfu.setDev_id(rs.getInt("dev_id"));
+ dfu.setSysVersion_new(rs.getInt("sysVersion_new"));
+ dfu.setSoftVersion_new(rs.getInt("softVersion_new"));
+ dfu.setSysVersion_dev(rs.getInt("sysVersion_dev"));
+ dfu.setSoftVersion_dev(rs.getInt("softVersion_dev"));
+ dfu.setDfu_file(rs.getString("dfu_file"));
+ 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_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) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
}
//鍗囩骇鐣岄潰瀹炴椂鍒锋柊
public List serchByCondition(Object obj) {
@@ -239,7 +273,7 @@
});
return listAll;
}
-
+
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
@@ -262,12 +296,16 @@
for (BattInf binf : listAll) {
System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
}*/
- /*
+
boolean bl=fimpl.addPro(binf);
- System.out.println(bl);*/
- List<BattInf> listAll=fimpl.serchInserStation(binf);
+ 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();
+ for (Fbs9100s_dfu_state dfu : listAll) {
+ System.out.println(dfu);
+ }*/
}
}
--
Gitblit v1.9.1