From 6ca12d78daab3ad1dec7f5bd6e1f26b6b5fd2f11 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 14:34:42 +0800
Subject: [PATCH] 批量设置放电参数的查询机房

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java |  248 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 233 insertions(+), 15 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
index 8529319..d132216 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import com.fgkj.actions.ActionUtil;
+import com.fgkj.dao.AlarmDaoFactory;
 import com.fgkj.dao.BaseDAO;
 import com.fgkj.dao.CallBack;
 import com.fgkj.dao.DAOHelper;
@@ -68,8 +69,8 @@
 		String sql="";
 		String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
 				" alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +
-				" DISTINCTbinf.stationName,DISTINCTbinf.FbsDeviceName " +
-				" FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf  where db_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? )  as DISTINCTbinf    " +
+				" DISTINCTbinf.stationName,DISTINCTbinf.stationName5,DISTINCTbinf.FbsDeviceName " +
+				" FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf  where db_battinf.tb_battinf.StationName LIKE ?  AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ?)  as DISTINCTbinf    " +
 				" WHERE  tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId  " +
 				" AND alm_start_time>=? and alm_start_time<=? ";
 		 
@@ -92,7 +93,7 @@
 		
 		sql=baseSql+endSql+limitSql;
 		
-		List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+		List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
 			,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()
 			,page.getPageSize()}, new CallBack() {
 				
@@ -114,8 +115,7 @@
 						
 						ddata.setDev_name(rs.getString("FbsDeviceName"));
 						ddata.setStationName(rs.getString("stationName"));
-						
-						
+						ddata.setStationName5(rs.getString("stationName5"));
 						list.add(ddata);
 					}
 				} catch (SQLException e) {
@@ -133,12 +133,224 @@
 		}
 		return list;
 	}
-
+    //缁熻鏈烘埧鐘舵�佸巻鍙�(鏈烘埧鐘舵��)
+	public List serchStateBydev_id(Object obj){
+		final BattInf binf=(BattInf) obj;
+		String sql="SELECT dev_id,alm_type,alm_start_time,alm_end_time,alm_cleared_type,usr_Id,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
+				   " from db_alarm.tb_devalarm_data_history,db_battinf.tb_battinf " +
+				   " where tb_devalarm_data_history.dev_id=tb_battinf.FBSDeviceId " +
+				   " and alm_type in("+AlarmDaoFactory.ALM_TYPE_BTS9100S_POFF_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_FADIAN_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID+
+				   " ,"+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+")  " +
+				   " and  alm_start_time>=?  and  alm_start_time<=?   " +
+				   " and stationname1 like ? and stationname2 like  ? and stationname3 like ? and stationid like ? " ;
+		//鎺掑簭
+		String orderSql=" order by dev_id,alm_start_time,alm_type asc ";
+		sql+=orderSql;
+		//System.out.println(sql);
+		//binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				int ALM_TYPE_BTS9100S_POFF_ComError_ID=0;//鍋滅數鏁�
+				int ALM_TYPE_BTS9100S_FADIAN_ComError_ID=0;//鍙戠數鏁�
+				int ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID=0;//鎺夌珯鏁�
+				int ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID=0;//鍏抽棬鏁�
+				int ALM_TYPE_BTS9100S_TEMPUP_ComError_ID    =0;		//鍩虹珯娓╁害涓婇檺鍛婅
+				int ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID   = 0;		//鍩虹珯娓╁害涓嬮檺鍛婅
+				int ALM_TYPE_BTS9100S_DAMPUP_ComError_ID    = 0;		//鍩虹珯婀垮害涓婇檺鍛婅
+				int ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID   = 0;		//鍩虹珯婀垮害涓嬮檺鍛婅
+				int dev_id=0;
+				// 鏃堕棿娈�
+				String perid_Time = "";
+				//鏈烘埧鍚嶇О
+				String stationName="";
+				try {
+					while(rs.next()){
+						int dev_ids=rs.getInt("dev_id");
+						int alm_types=rs.getInt("alm_type");
+						String stationNames=rs.getString("stationName");
+						// 骞翠唤锛屽搴︼紝鏈堜唤
+						Date dev_recordtime = rs.getTimestamp("alm_start_time");
+						// 鑾峰彇鍏蜂綋骞翠唤锛屾湀浠藉拰璇ユ湀鐨勬�诲ぉ鏁�
+						int year = dev_recordtime.getYear() + 1900;
+						int month = dev_recordtime.getMonth() + 1;
+						String perid_Times="";
+                        if(binf.getBattGroupNum()==1){//鏈堢粺璁�
+                        	perid_Times = ActionUtil.getFirstDayOfMonth(year, month - 1);
+        					perid_Times += " ";
+        					perid_Times += ActionUtil.getLastDayOfMonth(year, month - 1);
+						}else if (binf.getBattGroupNum()==3) {// 鎸夊勾浠�
+							perid_Times = ActionUtil.getFirstDayOfMonth(year, 0);
+							perid_Times += " ";
+							perid_Times += ActionUtil.getLastDayOfMonth(year, 11);
+						}
+                        if(perid_Times.equals(perid_Time)){
+                        	if(dev_ids==dev_id){
+    							if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_POFF_ComError_ID){
+    								ALM_TYPE_BTS9100S_POFF_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_FADIAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_FADIAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+=1;
+    							}
+    						}else{
+								Batt_devalarm_data_history dalarm=new Batt_devalarm_data_history();
+								dalarm.setStationName(stationName);
+								dalarm.setDev_id(dev_id);
+								dalarm.setNum(ALM_TYPE_BTS9100S_POFF_ComError_ID);
+								dalarm.setRecord_id(ALM_TYPE_BTS9100S_FADIAN_ComError_ID);
+								dalarm.setAlm_type(ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID);
+								dalarm.setAlm_level(ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID);
+								
+								dalarm.setAlm_is_confirmed(ALM_TYPE_BTS9100S_TEMPUP_ComError_ID);
+								dalarm.setAlm_cleared_type(ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID);
+								dalarm.setUsr_id(ALM_TYPE_BTS9100S_DAMPUP_ComError_ID);
+								dalarm.setNote(String.valueOf(ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID));
+								
+								dalarm.setDev_ip(perid_Time);
+								//System.out.println(1+"    "+dalarm.getDev_ip()+" "+dalarm.getDev_id()+" "+dalarm.getNum()+" "+dalarm.getRecord_id()+" "+dalarm.getAlm_type()+" "+dalarm.getAlm_level()+" "+dalarm.getStationName());
+								list.add(dalarm);
+								stationName=stationNames;
+    							dev_id=dev_ids;
+    							ALM_TYPE_BTS9100S_POFF_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_FADIAN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_TEMPUP_ComError_ID    =0;		//鍩虹珯娓╁害涓婇檺鍛婅
+    							ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID   = 0;		//鍩虹珯娓╁害涓嬮檺鍛婅
+    							ALM_TYPE_BTS9100S_DAMPUP_ComError_ID    = 0;		//鍩虹珯婀垮害涓婇檺鍛婅
+    							ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID   = 0;		//鍩虹珯婀垮害涓嬮檺鍛婅
+    							if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_POFF_ComError_ID){
+    								ALM_TYPE_BTS9100S_POFF_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_FADIAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_FADIAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+=1;
+    							}
+    						}
+                        }else{  
+                        	   if(perid_Time.equals("")){
+                        		   if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_POFF_ComError_ID){
+       								   ALM_TYPE_BTS9100S_POFF_ComError_ID+=1;
+       							    }else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_FADIAN_ComError_ID){
+       								   ALM_TYPE_BTS9100S_FADIAN_ComError_ID+=1;
+       							    }else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID){
+       								   ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+=1;
+       							    }else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID){
+       								   ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID+=1;
+       							    }else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID){
+        								ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+=1;
+        							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID){
+        								ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+=1;
+        							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID){
+        								ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+=1;
+        							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID){
+        								ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+=1;
+        							}
+                        		   perid_Time=perid_Times;
+                        		   dev_id=dev_ids;
+                        		   stationName=stationNames;
+                        		   continue;
+                                }
+                        		Batt_devalarm_data_history dalarm=new Batt_devalarm_data_history();
+    							dalarm.setStationName(stationName);
+    							dalarm.setDev_id(dev_id);
+    							dalarm.setNum(ALM_TYPE_BTS9100S_POFF_ComError_ID);
+    							dalarm.setRecord_id(ALM_TYPE_BTS9100S_FADIAN_ComError_ID);
+    							dalarm.setAlm_type(ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID);
+    							dalarm.setAlm_level(ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID);
+    							dalarm.setAlm_is_confirmed(ALM_TYPE_BTS9100S_TEMPUP_ComError_ID);
+								dalarm.setAlm_cleared_type(ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID);
+								dalarm.setUsr_id(ALM_TYPE_BTS9100S_DAMPUP_ComError_ID);
+								dalarm.setNote(String.valueOf(ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID));
+    							dalarm.setDev_ip(perid_Time);
+    							//System.out.println(2+" "+dalarm.getDev_ip()+" "+dalarm.getDev_id()+" "+dalarm.getNum()+" "+dalarm.getRecord_id()+" "+dalarm.getAlm_type()+" "+dalarm.getAlm_level()+" "+dalarm.getStationName());
+    						    list.add(dalarm);
+    							ALM_TYPE_BTS9100S_POFF_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_FADIAN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID=0;
+    							ALM_TYPE_BTS9100S_TEMPUP_ComError_ID    =0;		//鍩虹珯娓╁害涓婇檺鍛婅
+    							ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID   = 0;		//鍩虹珯娓╁害涓嬮檺鍛婅
+    							ALM_TYPE_BTS9100S_DAMPUP_ComError_ID    = 0;		//鍩虹珯婀垮害涓婇檺鍛婅
+    							ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID   = 0;		//鍩虹珯婀垮害涓嬮檺鍛婅
+    							if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_POFF_ComError_ID){
+    								ALM_TYPE_BTS9100S_POFF_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_FADIAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_FADIAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID){
+    								ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+=1;
+    							}else if(alm_types==AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID){
+    								ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+=1;
+    							}
+    							dev_id=dev_ids;
+    							stationName=stationNames;
+    							perid_Time=perid_Times;
+							
+                        }
+                       if(rs.isLast()){
+                        	Batt_devalarm_data_history dalarm=new Batt_devalarm_data_history();
+							dalarm.setStationName(stationNames);
+							dalarm.setDev_id(dev_ids);
+							dalarm.setNum(ALM_TYPE_BTS9100S_POFF_ComError_ID);
+							dalarm.setRecord_id(ALM_TYPE_BTS9100S_FADIAN_ComError_ID);
+							dalarm.setAlm_type(ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID);
+							dalarm.setAlm_level(ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID);
+							dalarm.setAlm_is_confirmed(ALM_TYPE_BTS9100S_TEMPUP_ComError_ID);
+							dalarm.setAlm_cleared_type(ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID);
+							dalarm.setUsr_id(ALM_TYPE_BTS9100S_DAMPUP_ComError_ID);
+							dalarm.setNote(String.valueOf(ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID));
+							
+							dalarm.setDev_ip(perid_Times);
+							//System.out.println(dalarm.getDev_ip()+" "+dalarm.getDev_id()+" "+dalarm.getNum()+" "+dalarm.getRecord_id()+" "+dalarm.getAlm_type()+" "+dalarm.getAlm_level()+" "+dalarm.getStationName());
+							list.add(dalarm);
+                        }
+                       // System.out.println(ALM_TYPE_BTS9100S_POFF_ComError_ID+" "+ALM_TYPE_BTS9100S_FADIAN_ComError_ID+" "+ALM_TYPE_BTS9100S_DIAOZHAN_ComError_ID+" "+ALM_TYPE_BTS9100S_DOOROPEN_ComError_ID);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
+	
 	public List serchByInfo(Object obj) {
 		// TODO Auto-generated method stub
 		return null;
 	}
-   public static void main(String[] args) throws ParseException {
+    public static void main(String[] args) throws ParseException {
 	    Batt_devalarm_data_historyImpl bimpl=new Batt_devalarm_data_historyImpl();
 		Page p = new Page();
 		p.setPageCurr(1);
@@ -153,17 +365,21 @@
 		 * 鍗曚綋鍐呴樆锛歮aint_close 
 		 * 杩炴帴鏉¢樆鎶楋細master_id
 		 * */
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		Date date1 = sdf.parse("2000-01-01");
-		Date date2 = sdf.parse("2020-01-01");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date1 = sdf.parse("2000-01-01 00:00:00");
+		Date date2 = sdf.parse("2020-01-01 00:00:00");
 		
 		
 		BattInf binf = new BattInf();
-		
+		binf.setNum(0);
 	    binf.setStationName("");
 		binf.setStationName1("");
-		binf.setBattProductDate(ActionUtil.getSimpDate(date1));
-		binf.setBattProductDate1(ActionUtil.getSimpDate(date2));
+		binf.setStationName2("");
+		binf.setStationName3("");
+		binf.setStationId("");
+		binf.setBattGroupNum(1);
+		binf.setBattInUseDate(ActionUtil.getSimpDate(date1));
+		binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));
 		
 		User_inf uinf=new User_inf();
 		uinf.setUId(1002);
@@ -171,9 +387,11 @@
 		bmd.setPage(p);
 		bmd.setBinf(binf);
         bmd.setUinf(uinf);
-        List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);
+        //List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);
+        List<Batt_devalarm_data_history> list=bimpl.serchStateBydev_id(binf);
+        System.out.println(list.size());
         for (Batt_devalarm_data_history b : list) {
-			System.out.println(b);
+			System.out.println(b.getDev_ip()+" "+b.getDev_id()+" "+b.getNum()+" "+b.getRecord_id()+" "+b.getAlm_type()+" "+b.getAlm_level()+" "+b.getAlm_is_confirmed()+" "+b.getAlm_cleared_type()+" "+b.getUsr_id()+" "+b.getNote()+" "+b.getStationName());
 		}
 }
 }

--
Gitblit v1.9.1