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/Batttestdata_infDAOImpl.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
index 1fd9d7b..4403217 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -206,7 +206,63 @@
}
});
}
-
+ //鍘嗗彶鏁版嵁鏌ヨ<-------璺ㄥ煙----------->
+ public List serchByCondition_ky(Object obj) {
+ final Batttestdata_inf bti=(Batttestdata_inf)obj;
+ String sql="select num,BattGroupId,test_record_count,test_record_count_ex,test_type,record_time_interval,data_new,data_available,record_num,test_starttime,test_starttime_ex,test_starttype,record_time,test_timelong,test_stoptype,group_vol,test_curr,test_cap,max_monnum,max_monvol,min_monnum,min_monvol,mon_num,mon_vol,upload_usr_id " +
+ " from db_batt_testdata.tb_batttestdata_inf where BattGroupId=? " +
+ " and db_batt_testdata.tb_batttestdata_inf.data_available=1 " +
+ " order by test_type asc,test_starttime desc ";
+ return DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bti.getBattGroupId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Batttestdata_inf b=new Batttestdata_inf();
+ b.setNum(rs.getInt("num"));
+ b.setBattGroupId(rs.getInt("BattGroupId"));
+ b.setTest_record_count(rs.getInt("test_record_count"));
+ b.setTest_record_count_ex(rs.getInt("test_record_count_ex"));
+ b.setTest_type(rs.getInt("test_type"));
+ b.setRecord_time_interval(rs.getInt("record_time_interval"));
+ b.setData_new(rs.getInt("data_new"));
+ b.setData_available(rs.getInt("data_available"));
+ b.setRecord_num(rs.getInt("record_num"));
+ b.setTest_starttime(rs.getTimestamp("test_starttime"));
+ b.setTest_starttime_ex(rs.getTimestamp("test_starttime_ex"));
+ b.setTest_starttype(rs.getInt("test_starttype"));
+ b.setRecord_time(rs.getTimestamp("record_time"));
+ b.setTest_timelong(rs.getInt("test_timelong"));
+ b.setTest_stoptype(rs.getInt("test_stoptype"));
+ //鏀剧數缁堟鍘熷洜
+
+ if(bti.getNum()/100000==6185){
+ b.setTest_stoptype_reason(BattTestData.getStopType_6185(b.getTest_stoptype()));
+ }else if(bti.getNum()/100000==4016){
+ b.setTest_stoptype_reason(BattTestData.getStopType_4016(b.getTest_stoptype()));
+ }else{
+ b.setTest_stoptype_reason(BattTestData.getStopType(b.getTest_starttype(), b.getTest_stoptype()));
+ }
+ b.setGroup_vol(rs.getFloat("group_vol"));
+ b.setTest_curr(rs.getFloat("test_curr"));
+ b.setTest_cap(rs.getFloat("test_cap"));
+ b.setMax_monnum(rs.getInt("max_monnum"));
+ b.setMax_monvol(rs.getFloat("max_monvol"));
+ b.setMin_monnum(rs.getInt("min_monnum"));
+ b.setMin_monvol(rs.getFloat("min_monvol"));
+ b.setMon_num(rs.getInt("mon_num"));
+ b.setMon_vol(rs.getFloat("mon_vol"));
+ b.setUpload_usr_id(rs.getInt("upload_usr_id"));
+ list.add(b);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ }
//6.2鏍规嵁battgroupi鍜宼est_starttime鏌est_record_count
public List serchTest_record_count(Object obj) {
Batttestdata_inf tdata=(Batttestdata_inf)obj;
@@ -443,13 +499,13 @@
String baseSql=" SELECT DISTINCT(tb_batttestdata_inf.BattGroupId),tb_batttestdata_inf.test_starttime,tb_batttestdata_inf.record_time,tb_batttestdata_inf.test_cap," +
" tb_batttestdata_inf.max_monvol,tb_batttestdata_inf.min_monvol,tb_batttestdata_inf.test_record_count,tb_batttestdata_inf.test_curr " +
",db_battinf.tb_battinf.load_curr AS curr " +
- ",db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
+ ",db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
" FROM db_batt_testdata.tb_batttestdata_inf " +
" LEFT OUTER JOIN db_battinf.tb_battinf ON db_batt_testdata.tb_batttestdata_inf.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
" WHERE tb_batttestdata_inf.test_starttime>=? and tb_batttestdata_inf.test_starttime<=? " +
" and db_batt_testdata.tb_batttestdata_inf.data_available=1 ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname2 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 endSql=" ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc ";
sql=baseSql+endSql;
@@ -458,7 +514,7 @@
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),
new Object[]{
binf.getBattProductDate(),binf.getBattProductDate1(),
- "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -470,6 +526,8 @@
BattInf binf=new BattInf();
binf.setStationId(rs.getString("stationId"));
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName(rs.getString("stationName"));
binf.setMonVolStd(rs.getFloat("monVolStd"));
binf.setMonCapStd(rs.getFloat("monCapStd"));
@@ -512,7 +570,7 @@
"mon_res,mon_ser,mon_conn_res,mon_cap " +
",BINARY(curr1+curr2+curr3) AS curr " +
",db_battinf.tb_battinf.stationid,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 " +
@@ -520,7 +578,7 @@
"LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id " +
"where ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
+ String stationSql=" 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=? ";
@@ -536,7 +594,7 @@
String orderSql=" order by db_battinf.tb_battinf.stationid asc";
sql=baseSql+endSql+orderSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -577,6 +635,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);
@@ -1013,11 +1073,20 @@
Batt_Maint_Dealarm bmd=new Batt_Maint_Dealarm();
bmd.setTdata(tdata);
bmd.setBinf(binf);
- List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
+ /*List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
System.out.println(b);
}
System.out.println(list.size());
+ */
+ Batttestdata_inf tinf=new Batttestdata_inf();
+ tinf.setBattGroupId(1002095);
+ tinf.setNum(910000577);
+ List<Batttestdata_inf> list=bimpl.serchByCondition_ky(tinf);
+ for (Batttestdata_inf b : list) {
+ System.out.println(b);
+ }
+ System.out.println(list.size());
}
--
Gitblit v1.9.1