From fa00382db413a8489d07983b66f0869305b51a9a Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 11:35:54 +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