From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index b8f8349..b8f1bb6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -230,6 +230,48 @@
}
return list;
}
+ //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�(鐢垫睜缁勪俊鎭厤缃�)
+ public List searchInform1(Object obj){
+ Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
+ BattInf binf=bmd.getBinf();
+ Page page=bmd.getPage();
+ Connection conn= DBUtil.getConn();
+ String numberSql=" SELECT FOUND_ROWS() number";
+ String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName,FBSDeviceId " +
+ " From db_battinf.tb_battinf " +
+ " limit ?,?";
+ List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list = new ArrayList<BattInf>();
+ int id=0;
+
+ try {
+ while (rs.next()) {
+ BattInf binf = new BattInf();
+ binf.setStationId(rs.getString("stationId"));
+ binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName3(rs.getString("stationName3"));
+ binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ binf.setStationName(rs.getString("stationName"));
+ binf.setStationId_ex(rs.getString("stationId_ex"));
+ list.add(binf);
+
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ //鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+ int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
+ if(list!=null&&list.size()>0){
+ list.get(list.size()-1).setNum(number);
+ }
+ return list;
+ }
//娣诲姞鐢垫睜缁勬椂鏌ヨ鍑烘渶澶х殑鏈烘埧id鍜岀數姹犵粍id
public List searchMaxId(){
String sql="select max(stationid) as maxs,max(battgroupid) as maxb from db_battinf.tb_battinf limit 1";
@@ -3436,7 +3478,7 @@
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
"from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
@@ -3458,6 +3500,8 @@
while (rs.next()) {
BattInf batt = new BattInf();
batt.setStationName(rs.getString("stationName"));
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
batt.setStationId(rs.getString("StationId"));
batt.setStationIp(rs.getString("StationIP"));
batt.setBattGroupName(rs.getString("BattGroupName").trim());
@@ -3811,8 +3855,9 @@
//List<BattInf> list = biml.serchByConditionNew(bmd);
//List<BattInf> list=biml.serchByTestType(bmd);
//List<BattInf> list=biml.serchGroupAssess(bmd);
- List<BattInf> list=biml.serchMakeGroup(binf);
+ //List<BattInf> list=biml.serchMakeGroup(binf);
//List<BattInf> list=biml.serchGroupByInfor(binf);
+ List<BattInf> list=biml.searchInform1(bmd);
for (BattInf b : list) {
System.out.println(b);
}
--
Gitblit v1.9.1