From 8510cfb2b0f65ead92110b52e8467dcc44e48b32 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 27 十一月 2018 16:45:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 52 ++++++++++++++++++--------
gx_tieta/src/com/fgkj/services/BattInfServices.java | 15 +++++--
2 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 0586a20..dd8c1f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1113,37 +1113,57 @@
return number;
}
//鏌ヨ璁惧鎬绘暟(鍏ㄩ儴)
- public int serchByDeviceId_all(Object obj){
+ public List serchByDeviceId_all(Object obj){
User_inf uinf=(User_inf) obj;
- String sql=" SELECT COUNT(DISTINCT fbsdeviceid) number FROM db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? " +
- " limit 1 ";
- List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+ String sql=" SELECT DISTINCT fbsdeviceid,station_install,monvolstd 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=? " +
+ " ) ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
+ int num_2_install=0;//2v宸插畨瑁�
+ int num_2=0;//2v鍏ㄩ儴
+ int num_12_install=0;//12v宸插畨瑁�
+ int num_12=0;//12v鍏ㄩ儴
+ int num_install=0;//宸插畨瑁�
+ int num=0;//鍏ㄩ儴
try {
while(rs.next()){
- BattInf binf=new BattInf();
- binf.setNum(rs.getInt("number"));
- list.add(binf);
+ int insatll=rs.getInt("station_install");
+ float monvolstd=rs.getFloat("monvolstd");
+ if(insatll==1){
+ num_install+=1;
+ if(monvolstd==2.0){
+ num_2_install+=1;
+ }else{
+ num_12_install+=1;
+ }
+ }
+ if(monvolstd==2.0){
+ num_2+=1;
+ }else{
+ num_12+=1;
+ }
+ num+=1;
}
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+ list.add(num_2_install);
+ list.add(num_2);
+ list.add(num_12_install);
+ list.add(num_12);
+ list.add(num_install);
+ list.add(num);
return list;
}
});
- int number=0;//瀛樻斁鎬绘暟
- if(list!=null&&list.size()>0){
- number=list.get(list.size()-1).getNum();
- }
- return number;
+ return list;
}
//-----------鏍规嵁钃勭數姹犵粍鏌ヤ笉閲嶅鐨凪onCount(monNum)锛堝崟浣撶紪鍙凤級
public List serchByMonNum(Object obj){
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index eb5a36f..7f09cfc 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -986,10 +986,17 @@
}
//棣栭〉涓婃樉绀哄凡瀹夎鏁板拰鍏ㄩ儴鍩虹珯鏁�
public ServiceModel serchDevice(Object obj){
- int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
- int allNum=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
- model.setSum(allNum);
- model.setNewsum(devNum);
+ //int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ List list=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ //System.out.println(model.getData());
return model;
}
--
Gitblit v1.9.1