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 |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index 8592d42..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -27,6 +27,7 @@
 import com.fgkj.dto.Batttestdata_inf;
 import com.fgkj.dto.Page;
 import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User;
 import com.fgkj.dto.User_inf;
 import com.fgkj.dto.User_log;
 
@@ -175,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;
 	} 	
@@ -224,9 +240,8 @@
 		
 	}
 	
-	//0.5鏌ヨ瀹炴椂鍛婅鏁�
+	//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);//瀹归噺鍛婅鍛婅鏁�
@@ -238,11 +253,10 @@
 		adata.setAlm_cleared_type(0);//鍗曚綋鍐呴樆鍛婅鏁�
 		adata.setUsr_Id(0);//杩炴帴鏉¢樆鎶楀憡璀︽暟
 		adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
-
-		bmd.setAdata(adata);
+        adata.setRecord_Id(0l);//鍦ㄧ嚎鐢靛帇鍛婅鏁�
 		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){
@@ -279,6 +293,9 @@
 				}
 				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){
+					adata.setRecord_Id((long)list.get(i).getNum());//鍦ㄧ嚎鐢靛帇鍛婅鏁�
 					numZ+=list.get(i).getNum();
 				}
 
@@ -566,20 +583,21 @@
 		tdata.setRecord_time(ActionUtil.getSimpDate(date1));
 		tdata.setRecord_time1(ActionUtil.getSimpDate(date2));
 		
+		User_inf uinf=new User_inf();
+		uinf.setUId(1002);
 		Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
 		bmd.setPage(p);
 		bmd.setAdata(adata);
 		bmd.setMainf(mainf);
 		bmd.setBinf(binf);
 		bmd.setTdata(tdata);
+		bmd.setUinf(uinf);
 		//System.out.println(bmd);
 		//bs.serchByCondition(bmd);
 		//bs.serchByInfo(bmd);
-		//.serchAlm(bmd);
+		bs.serchAlm(uinf);
 		//bs.serchGood();
-		User_inf uinf=new User_inf();
-		uinf.setUId(1038);
-		bs.serchTopAlmTen(uinf);
+		//bs.serchTopAlmTen(uinf);
 	}
 
 }

--
Gitblit v1.9.1