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/Batt_enduranceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 73fa1ae..79b8943 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -11,6 +11,7 @@
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.LimitNumberFactory;
import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattMap_information;
import com.fgkj.dto.Batt_endurance;
import com.fgkj.dto.Page;
import com.fgkj.dto.User_inf;
@@ -48,7 +49,7 @@
Page page=bendurance.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +
+ String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,endurance_actual_timelong_max,endurance_actual_timelong_min,is_out_stand " +
",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " +
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+
@@ -101,8 +102,11 @@
b.setReal_cap(rs.getFloat("real_cap"));
b.setMoncapstd(rs.getFloat("moncapstd"));
b.setReal_curr(rs.getFloat("real_curr"));
- b.setEndurance_theory_timelong(rs.getInt("endurance_theory_timelong"));
- b.setEndurance_actual_timelong(rs.getInt("endurance_actual_timelong"));
+ b.setEndurance_theory_timelong(rs.getFloat("endurance_theory_timelong"));
+ b.setEndurance_actual_timelong(rs.getFloat("endurance_actual_timelong"));
+ b.setEndurance_actual_timelong_max(rs.getFloat("endurance_actual_timelong_max"));
+ b.setEndurance_actual_timelong_min(rs.getFloat("endurance_actual_timelong_min"));
+ b.setIs_out_stand(rs.getInt("is_out_stand"));
b.setStationName(rs.getString("stationname"));
b.setStationName1(rs.getString("stationname1"));
b.setStationName2(rs.getString("stationname2"));
@@ -207,6 +211,33 @@
}
return nums;
}
+ //鏍规嵁鏈烘埧id鏌ヨ璇ユ満鎴跨画鑸笉瓒崇殑鏁�
+ public int serchxuhangNotInThree_stationid(Object obj) {
+ BattMap_information binformation=(BattMap_information) obj;
+ String sql="select count(distinct tb_batt_endurance.deviceid) as nums from web_site.tb_batt_endurance " +
+ " where endurance_actual_timelong<180 and tb_batt_endurance.stationid=? " ;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binformation.getStationId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ int nums=rs.getInt("nums");
+ list.add(nums);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//缁埅涓嶈冻3灏忔椂鏁�
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
@@ -237,7 +268,11 @@
System.out.println(num);
}*/
//System.out.println(list.size());
- int nums=bimpl.serchxuhangNotInThree(uinf);
+ /*int nums=bimpl.serchxuhangNotInThree(uinf);
+ System.out.println(nums);*/
+ BattMap_information binformation=new BattMap_information();
+ binformation.setStationId("42000530");
+ int nums=bimpl.serchxuhangNotInThree_stationid(binformation);
System.out.println(nums);
}
--
Gitblit v1.9.1