From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 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..0d374c2 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
@@ -1930,7 +1986,7 @@
Page p = new Page();
p.setPageCurr(1);
- p.setPageSize(10);
+ p.setPageSize(10000);
/*鏉′欢鎵�瀛樻斁鐨勪綅缃墠鍙帮細tb_batt_maint_inf
* 鍦ㄧ嚎鐢靛帇锛歶sr_id
* 缁勭鐢靛帇锛歠ault_type_id
@@ -1945,7 +2001,7 @@
Date date1 = sdf.parse("2000-01-01");
Date date2 = sdf.parse("2020-01-01");
Batt_maint_inf mainf=new Batt_maint_inf();
- mainf.setUsr_id(0);
+ mainf.setUsr_id(1002);
mainf.setFault_type_id(119002);
mainf.setFault_level(119003);
mainf.setRecord_uid(119004);
@@ -1971,6 +2027,9 @@
binf.setStationName("");
binf.setStationName1("");
+ binf.setStationName2("");
+ binf.setStationName3("");
+ binf.setStationName5("");
binf.setBattGroupId(0);
@@ -1983,12 +2042,12 @@
bmd.setBinf(binf);
bmd.setUinf(uinf);
- //List<Batt_Maint_Dealarm> list = bimp.serchByCondition(bmd);
- /* List<Batt_Maint_Dealarm> list = bimp.serchByInfo(bmd);
+ List<Batt_Maint_Dealarm> list = bimp.serchByCondition(bmd);
+ //List<Batt_Maint_Dealarm> list = bimp.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
System.out.println(b);
}
- System.out.println(list.size());*/
+ System.out.println(list.size());
// List list=bimp.serchRealTime(uinf);
// System.out.println(list);
/*List<Integer> list = bimp.serchGood(uinf);
@@ -1997,7 +2056,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