From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index efcd26d..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,13 +176,28 @@
//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ
public ServiceModel serchByCondition(Object obj){
model=new ServiceModel();
- List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
+ List list=dao.serchByCondition(obj);
if(list!=null && list.size()>1){
model.setCode(1);
model.setData(list);
}else {
model.setCode(0);
model.setData(list);
+ }
+ return model;
+ }
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public ServiceModel serchByCondition_ky(Object obj){
+ model=new ServiceModel();
+ List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>1){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
}
return model;
}
@@ -227,10 +242,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 +252,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 +291,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();
}
@@ -582,7 +595,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