From 426ae9a57c515b37b0996f62bdf10079110ce488 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.32>
Date: 星期四, 15 十一月 2018 09:27:57 +0800
Subject: [PATCH] 升级界面进入时查询正在升级的设备
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java | 13 +++++++++++++
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java | 7 ++++++-
3 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
index 6dd943d..44e86e0 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -66,7 +66,12 @@
result=tojson(model);
return SUCCESS;
}
-
+ //鍗囩骇鐣岄潰瀹炴椂鍒锋柊
+ public String searchAll(){
+ ServiceModel model=service.searchAll();
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
}
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 8a918d8..fc17d26 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
@@ -187,10 +187,36 @@
// TODO Auto-generated method stub
return false;
}
-
+ //鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
public List searchAll() {
- // TODO Auto-generated method stub
- return null;
+ String sql=" select * from db_ram_db.tb_fbs9100s_dfu_state where 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"));
+ list.add(dfu);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
}
//鍗囩骇鐣岄潰瀹炴椂鍒锋柊
public List serchByCondition(Object obj) {
@@ -242,7 +268,7 @@
});
return listAll;
}
-
+
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
@@ -268,9 +294,13 @@
/*
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();
+ for (Fbs9100s_dfu_state dfu : listAll) {
+ System.out.println(dfu);
}
}
}
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
index 8f5070c..fd7bb9b 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
@@ -104,4 +104,17 @@
}
return model;
}
+ //鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
+ public ServiceModel searchAll() {
+ List list=dao.searchAll();
+ if(list!=null&&list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
}
--
Gitblit v1.9.1