From 1229c0030c8bb76ee89b9c08c074315b4bbfd44a Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.9>
Date: 星期一, 26 十一月 2018 15:16:54 +0800
Subject: [PATCH] 首页上电池告警率加入容量更换和容量告警告警
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 20 +++++++++-----------
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 18 +++++++-----------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index e6ffb26..5fc087e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1296,25 +1296,21 @@
return list;
}*/
public List serchAlm(Object obj){
- Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
- Battalarm_data adata=bmd.getAdata();
- BattInf binf=bmd.getBinf();
- User_inf uinf=bmd.getUinf();
+ User_inf uinf=(User_inf) obj;
String sql="select count(num) as number,alm_id " +
"from db_alarm.tb_battalarm_data " +
"where " +
"alm_cleared_type=0 " ;
//鏍规嵁鍩庡競閫夊彇
- String citySql=" and tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid " +
- " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
- " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
- " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1 ) " +
+ String citySql=" and tb_battalarm_data.BattGroupId in ( select distinct db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId " +
+ " 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 tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId from db_battinf.tb_battinf where station_install=1) " +
" GROUP BY(alm_id) ";
sql+=citySql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId(),"%"+binf.getStationName()+"%"}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index efcd26d..5969b67 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -227,10 +227,9 @@
//0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public ServiceModel serchAlm(Object obj){
- Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
Battalarm_data adata=new Battalarm_data();
adata.setNum(0);//瀹炴椂鍛婅鎬绘暟
- //adata.setBattGroupId(0);//瀹归噺鍛婅鍛婅鏁�
+ adata.setBattGroupId(0);//瀹归噺鍛婅鍛婅鏁�
adata.setMonNum(0);//缁勭鐢靛帇鍛婅鏁�
adata.setAlm_id(0);//鍏呯數鐢垫祦鍛婅鏁�
adata.setAlm_signal_id(0);//鏀剧數鐢垫祦鍛婅鏁�
@@ -238,18 +237,17 @@
adata.setAlm_is_confirmed(0);//鍗曚綋娓╁害鍛婅鏁�
adata.setAlm_cleared_type(0);//鍗曚綋鍐呴樆鍛婅鏁�
adata.setUsr_Id(0);//杩炴帴鏉￠樆鎶楀憡璀︽暟
- //adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
+ adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
adata.setRecord_Id(0l);//鍦ㄧ嚎鐢靛帇鍛婅鏁�
- bmd.setAdata(adata);
int numZ=0;//鍛婅鎬绘暟
//姹傚叓绉嶇被鍨嬪憡璀︾殑鏁伴噺
- List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
+ List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(obj);
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
- /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
+ if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
adata.setBattGroupId(list.get(i).getNum());//瀹归噺鍛婅鍛婅鏁�
numZ+=list.get(i).getNum();
- }*/
+ }
if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Group){
adata.setMonNum(list.get(i).getNum());//缁勭鐢靛帇鍛婅鏁�
numZ+=list.get(i).getNum();
@@ -278,10 +276,10 @@
adata.setUsr_Id(list.get(i).getNum());//杩炴帴鏉￠樆鎶楀憡璀︽暟
numZ+=list.get(i).getNum();
}
- /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
+ if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
adata.setAlm_value((float)list.get(i).getNum());//瀹归噺鏇存崲鍛婅鏁�
numZ+=list.get(i).getNum();
- }*/if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
+ }if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
adata.setRecord_Id((long)list.get(i).getNum());//鍦ㄧ嚎鐢靛帇鍛婅鏁�
numZ+=list.get(i).getNum();
}
@@ -291,7 +289,7 @@
adata.setNum(numZ);//瀹炴椂鍛婅鎬绘暟
model.setCode(1);
model.setData(adata);
- //System.out.println(model.getData());
+ System.out.println(model.getData());
return model;
}
@@ -582,7 +580,7 @@
//System.out.println(bmd);
//bs.serchByCondition(bmd);
//bs.serchByInfo(bmd);
- bs.serchAlm(bmd);
+ bs.serchAlm(uinf);
//bs.serchGood();
//bs.serchTopAlmTen(uinf);
}
--
Gitblit v1.9.1