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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 af0dcd0..0d374c2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -577,7 +577,6 @@
while (rs.next()) {
String name="鏈煡"; //瀛樻斁鍛婅鍚嶇О
String type="鏈煡"; //瀛樻斁鍛婅绛夌骇
- Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
Battalarm_data adata = new Battalarm_data();
adata.setNum(rs.getInt("num"));
@@ -1987,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
@@ -2002,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);
@@ -2028,6 +2027,9 @@
binf.setStationName("");
binf.setStationName1("");
+ binf.setStationName2("");
+ binf.setStationName3("");
+ binf.setStationName5("");
binf.setBattGroupId(0);
@@ -2040,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);
@@ -2056,9 +2058,9 @@
//System.out.println(list.size());
/*int nums=bimp.searchAlarmInStation(uinf);
System.out.println(nums);*/
- List<Battalarm_data> list = bimp.serchByCondition_ky(binf);
+ /*List<Battalarm_data> list = bimp.serchByCondition_ky(binf);
for (Battalarm_data b : list) {
System.out.println(b);
- }
+ }*/
}
}
--
Gitblit v1.9.1