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_rtstateDAOImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index 22b9fb4..55d807f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -83,6 +83,47 @@
}
});
}
+ //瀹炴椂鐩戞祴<-------璺ㄥ煙----------->
+ public List serchByCondition_ky(Object obj) {
+ Batt_rtstate br=(Batt_rtstate)obj;
+ String sql="select num,BattGroupId,batt_count,rec_datetime,group_vol,online_vol,group_curr,batt_state," +
+ "batt_test_type,batt_test_starttime,batt_test_recordtime,batt_test_tlong," +
+ "batt_test_cap,batt_real_cap,batt_rest_cap,batt_rest_power1_time,batt_rest_power2_time" +
+ " from db_ram_db.tb_batt_rtstate where BattGroupId=?";
+ return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{br.getBattGroupId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Batt_rtstate b=new Batt_rtstate();
+ b.setNum(rs.getInt("num"));
+ b.setBattGroupId(rs.getInt("BattGroupId"));
+ b.setBatt_count(rs.getInt("batt_count"));
+ b.setRec_datetime(rs.getTimestamp("rec_datetime"));
+ b.setOnline_vol(rs.getFloat("online_vol"));
+ b.setGroup_vol(rs.getFloat("group_vol"));
+ b.setGroup_curr(rs.getFloat("group_curr"));
+ b.setBatt_state(rs.getInt("batt_state"));
+ b.setBatt_test_type(rs.getInt("batt_test_type"));
+ b.setBatt_test_starttime(rs.getTimestamp("batt_test_starttime"));
+ b.setBatt_test_recordtime(rs.getTimestamp("batt_test_recordtime"));
+ b.setBatt_test_tlong(rs.getInt("batt_test_tlong"));
+ b.setBatt_test_cap(rs.getFloat("batt_test_cap"));
+ b.setBatt_real_cap(rs.getFloat("batt_real_cap"));
+ b.setBatt_rest_cap(rs.getFloat("batt_rest_cap"));
+ b.setBatt_rest_power1_time(rs.getInt("batt_rest_power1_time"));
+ b.setBatt_rest_power2_time(rs.getInt("batt_rest_power2_time"));
+ //System.out.println(b);
+ list.add(b);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ }
//娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鏃�)
public List serchDisOrChargr(){
String sql=" SELECT db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid " +
@@ -126,7 +167,7 @@
//娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鐢ㄦ埛绠＄悊鐨勬満鎴�)
public List serchDisOrChargrNew(Object obj){
User_inf uinf=(User_inf) obj;
- String sql=" SELECT distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid" +
+ String sql=" SELECT distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid,stationName,stationName1,stationName2,stationName3,stationName5 " +
" from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " +
" where batt_test_type IN(2,3) " +
" and db_ram_db.tb_batt_rtstate.battgroupid=db_battinf.tb_battinf.BattGroupId " +
@@ -150,6 +191,11 @@
bstate.setBatt_test_type(rs.getInt("batt_test_type"));
bstate.setNote(rs.getString("stationid"));
bstate.setBatt_test_tlong(rs.getInt("fbsdeviceid"));
+ bstate.setStationName(rs.getString("stationName"));
+ bstate.setStationName1(rs.getString("stationName1"));
+ bstate.setStationName2(rs.getString("stationName2"));
+ bstate.setStationName3(rs.getString("stationName3"));
+ bstate.setStationName5(rs.getString("stationName5"));
if(rs.getInt("batt_test_type")==3){
dischar++;
}else if(rs.getInt("batt_test_type")==2){
@@ -599,7 +645,7 @@
",tb_batt_rtdata.BattGroupId,tb_batt_rtdata.rec_datetime,mon_num,mon_vol,mon_tmp," +
"mon_res,mon_ser,mon_conn_res,mon_cap" +
",db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
- ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
+ ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
",max(binary tb_batt_rtdata.mon_vol) as maxmonvol,min(binary tb_batt_rtdata.mon_vol) as minmonvol " +
"FROM db_ram_db.tb_batt_rtstate " +
"LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId " +
@@ -622,7 +668,7 @@
" and db_user.tb_user_inf.uid=? )";
baseSql+=userSql;
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? AND db_battinf.tb_battinf.stationname5 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -638,7 +684,7 @@
String limitSql=" limit ?,?";
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum(),(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
@@ -680,7 +726,8 @@
binf.setDeviceName(rs.getString("deviceName"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
-
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName9(BattTestData.battState(rs.getInt("batt_state")));
state.setBstate(bstate);
@@ -702,13 +749,50 @@
}
return list;
}
- public static void main(String[] args) {
+
+ //鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑鐢垫睜缁刬d(寰堥噸瑕�**********)
+ public int searchMaxBattgroupId(){
+ String sql=" select max(battgroupId) as id from db_ram_db.tb_batt_rtstate limit 1";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ int battgroupid=1010000;
+ if(rs.getString("id")!=null){
+ battgroupid=rs.getInt("id");
+ }
+ list.add(battgroupid);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int battgroupid=0;
+ if(list!=null&&list.size()>0){
+ battgroupid=(Integer) list.get(list.size()-1);
+ }
+ return battgroupid;
+ }
+ public static void main(String[] args) {
User_inf uinf=new User_inf();
uinf.setUId(1001);
Batt_rtstateDAOImpl bimpl=new Batt_rtstateDAOImpl();
/*List<Batt_rtstate> list=bimpl.serchDisOrChargrNew(uinf);
for (Batt_rtstate b : list) {
System.out.println(b);
- }*/
-}
+ }*/
+ Batt_rtstate br=new Batt_rtstate();
+ br.setBattGroupId(1002101);
+ /*List<Batt_rtstate> list=bimpl.serchByCondition_ky(br);
+ for (Batt_rtstate b : list) {
+ System.out.println(b);
+ }*/
+ int battgroupid=bimpl.searchMaxBattgroupId();
+ System.out.println(battgroupid);
+ }
}
--
Gitblit v1.9.1