From 12e9ba156bb74248258e78e4a6ecaf89518010b6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 28 十一月 2018 16:44:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 15 +++++++
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 40 +++++++++++++++++++-
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 4 +-
gx_tieta/src/com/fgkj/services/BattInfServices.java | 17 ++++++++
4 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 8520b5f..947b4f5 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -399,7 +399,20 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public String serchByDeviceId(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByDeviceId(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public String serchByInstall_count(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByInstall_count(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index dd8c1f2..4b6c4c8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1112,6 +1112,40 @@
}
return number;
}
+ //鏌ュ崟浣撴�绘暟(宸插畨瑁呯殑鍗曚綋)
+ public int serchByInstall_count(Object obj){
+ User_inf uinf=(User_inf) obj;
+ String sql=" SELECT sum(moncount) as nums FROM db_battinf.tb_battinf " +
+ " where StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id " +
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? " +
+ " ) " +
+ " and db_battinf.tb_battinf.station_install=1";
+ //System.out.println(sql);
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ int nums=0;//鍗曚綋鎬绘暟
+ try {
+ while(rs.next()){
+ nums=rs.getInt("nums");
+ list.add(nums);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+
+ });
+ int number=0;//瀛樻斁鎬绘暟
+ if(list!=null&&list.size()>0){
+ number=(Integer) list.get(list.size()-1);
+ }
+ return number;
+ }
//鏌ヨ璁惧鎬绘暟(鍏ㄩ儴)
public List serchByDeviceId_all(Object obj){
User_inf uinf=(User_inf) obj;
@@ -4256,12 +4290,14 @@
//List<BattInf> list=biml.serchGroupByInfor(binf);
//List<BattInf> list=biml.searchInform1(bmd);
//<BattInf> list=biml.serchStationName5(binf);
- List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
+ /*List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
//List<BattInf> list=biml.searchInform_ky();
for (BattInf b : list) {
System.out.println(b);
}
- System.out.println(list.size());
+ System.out.println(list.size());*/
+ int nums=biml.serchByInstall_count(uinf);
+ System.out.println(nums);
}
public List getResults(ResultSet rs) {
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 a471494..2f40874 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
@@ -32,7 +32,7 @@
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.getNum()+" FROM db_battinf.tb_battinf " +
+ " SELECT DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1,"+binf.getSize()+" 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=? "; //鍏蜂綋鏈烘埧
@@ -276,8 +276,8 @@
return listAll;
}
+ //鍗囩骇鐣岄潰鐐瑰嚮娣诲姞鐨勬椂鍊欐煡璇㈠嚭璁惧瀵瑰簲鐨勭増鏈彿
public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
return null;
}
public static void main(String[] args) {
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 7f09cfc..72477ae 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -999,7 +999,22 @@
//System.out.println(model.getData());
return model;
}
-
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public ServiceModel serchByDeviceId(Object obj){
+ int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public ServiceModel serchByInstall_count(Object obj){
+ int devNum=(new BattInfImpl()).serchByInstall_count(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
public static void main(String[] args) {
//new BattInfServices().findMenu();
BattInf b=new BattInf();
--
Gitblit v1.9.1