From 592720573d6b194bbac25b25b6c619376cb9c0a4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 13 十二月 2018 13:38:34 +0800
Subject: [PATCH] 修改电池查询面板中正则的验证
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 5fc087e..3471be0 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -552,6 +552,62 @@
return list;
}
+ // 3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public List serchByCondition_ky(Object obj) {
+ BattInf binf=(BattInf) obj;
+ String sql="";
+ String baseSql = "select distinct db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time "
+ + " ,stationname,stationname5,battgroupname"
+ + " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
+ + " where alm_cleared_type=0 ";
+ //鐢ㄤ簬鐢垫睜缁勬潯浠�
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";//鍏ㄩ儴
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";
+ if(binf.getBattGroupId()==0){
+ baseSql+=idSqlT;
+ }else{
+ baseSql+=idSqlF;
+ }
+ String endSql="order by db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.alm_start_time desc,db_alarm.tb_battalarm_data.monnum asc ";
+ sql=baseSql+endSql;
+ List list = DAOHelper.executeQuery(sql,DBUtil.getConn(),new Object[] {binf.getBattGroupId()}, new CallBack() {
+ public List getResults(ResultSet rs) {
+ List list = new ArrayList();
+ try {
+ while (rs.next()) {
+ String name="鏈煡"; //瀛樻斁鍛婅鍚嶇О
+ String type="鏈煡"; //瀛樻斁鍛婅绛夌骇
+
+ Battalarm_data adata = new Battalarm_data();
+ adata.setNum(rs.getInt("num"));
+ adata.setBattGroupId(rs.getInt("battGroupId"));
+ adata.setAlm_signal_id(rs.getInt("alm_signal_id"));
+ adata.setMonNum(rs.getInt("monNum"));
+ adata.setAlm_value(rs.getFloat("alm_value"));
+ adata.setAlm_level(rs.getInt("alm_level"));
+ adata.setAlm_is_confirmed(rs.getInt("alm_is_confirmed"));
+ adata.setAlm_confirmed_time(rs.getTimestamp("alm_confirmed_time"));
+ adata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
+ adata.setAlm_end_time(rs.getTimestamp("alm_end_time"));
+
+ adata.setStationname(rs.getString("stationName"));
+ adata.setBattGroupName(rs.getString("battGroupName"));
+ //battinf涓殑StationName8锛孲tationName9瀛樻斁鍛婅鍚嶇О鍜岀瓑绾�
+ name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
+ adata.setAlarmname(name);
+ type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
+ adata.setAlarmtype(type);
+ list.add(adata);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
// 3.2鐢垫睜鍛婅
/*
* 鏉′欢鎵�瀛樻斁鐨勪綅缃墠鍙帮細tb_batt_maint_inf
@@ -1997,7 +2053,11 @@
}*/
//List list=bimp.serchIn30(uinf);
//System.out.println(list.size());
- int nums=bimp.searchAlarmInStation(uinf);
- System.out.println(nums);
+ /*int nums=bimp.searchAlarmInStation(uinf);
+ System.out.println(nums);*/
+ List<Battalarm_data> list = bimp.serchByCondition_ky(binf);
+ for (Battalarm_data b : list) {
+ System.out.println(b);
+ }
}
}
--
Gitblit v1.9.1