From a185180d8e0add7162d7a42c8755546c3f15efee Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:52 +0800
Subject: [PATCH] 放电的图表
---
gx_tieta/src/com/fgkj/services/BatttestdataService.java | 37 ++++++++++++++++--
gx_tieta/src/com/fgkj/dao/impl/BatttestdataDAOImpl.java | 57 +++++++++++++++++++++++++++-
2 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdataDAOImpl.java
index 21f5b41..5f20bbc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdataDAOImpl.java
@@ -159,6 +159,58 @@
});
return list;
}
+ //鍘嗗彶鐩戞祴<-------璺ㄥ煙----------->
+ public List serchByCondition_ky(Object obj) {
+ Batttestdata btd=(Batttestdata)obj;
+ int number=btd.getRecord_num();//鎬绘暟
+ int roteN=0;
+ int endN=BattTestData.RC_NUM_PARAM;//鎬荤瑪鏁�
+ if(number<=endN){
+ roteN=1;
+ }else{
+ if(number%endN==0){
+ roteN=number/endN;
+ }else{
+ roteN=number/endN+1;
+ }
+ }
+ String sql="select num,BattGroupId,test_record_count,test_type,data_new,data_available,record_num,test_starttime,record_time,test_timelong,online_vol,group_vol,test_curr,test_cap,mon_num,mon_vol,mon_tmp " +
+ " from db_batt_testdata.tb_batttestdata_"+btd.getBattGroupId()+"" +
+ " where test_record_count=? and (record_num%"+roteN+"=0 or test_timelong>=? or test_timelong<= ?) " +
+ " and db_batt_testdata.tb_batttestdata_"+btd.getBattGroupId()+".data_available=1 ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{btd.getTest_record_count(),btd.getNum(),btd.getTest_type()}, new CallBack() {
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Batttestdata b=new Batttestdata();
+ b.setNum(rs.getInt("num"));
+ b.setBattGroupId(rs.getInt("BattGroupId"));
+ b.setTest_record_count(rs.getInt("test_record_count"));
+ b.setTest_type(rs.getInt("test_type"));
+ 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.setRecord_time(rs.getTimestamp("record_time"));
+ b.setTest_timelong(rs.getInt("test_timelong"));
+ b.setOnline_vol(rs.getFloat("online_vol"));
+ b.setGroup_vol(rs.getFloat("group_vol"));
+ b.setTest_curr(rs.getFloat("test_curr"));
+ b.setTest_cap(rs.getFloat("test_cap"));
+ b.setMon_num(rs.getInt("mon_num"));
+ b.setMon_vol(rs.getFloat("mon_vol"));
+ b.setMon_tmp(rs.getFloat("mon_tmp"));
+ list.add(b);
+ }
+ }catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//鏌ヨ鏌愪竴娆℃祴璇曚腑鐨勬渶澶т竴娆＄殑娴嬭瘯鏃堕暱鍜屾渶鐭椂闀�<鍘嗗彶鐩戞祴>
public List serchMaxAndMintime(Object obj){
Batttestdata btb=(Batttestdata) obj;
@@ -225,10 +277,11 @@
public static void main(String[] args) {
Batttestdata b=new Batttestdata();
- b.setBattGroupId(1000010);
+ b.setBattGroupId(1002085);
b.setTest_record_count(1);
Date d1 = new Date();
- List list=new BatttestdataDAOImpl().serchByCondition(b);
+ //List list=new BatttestdataDAOImpl().serchByCondition(b);
+ List list=new BatttestdataDAOImpl().serchByCondition_ky(b);
System.out.println(new Date().getTime() - d1.getTime());
System.out.println(list.size()+"*********");
}
diff --git a/gx_tieta/src/com/fgkj/services/BatttestdataService.java b/gx_tieta/src/com/fgkj/services/BatttestdataService.java
index 5c4e726..b6b7023 100644
--- a/gx_tieta/src/com/fgkj/services/BatttestdataService.java
+++ b/gx_tieta/src/com/fgkj/services/BatttestdataService.java
@@ -34,11 +34,39 @@
if(list!=null && list.size()>0){
model.setCode(1);
model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
}
}
return model;
}
-
+ //鍘嗗彶鐩戞祴鈥斺�旀姌绾垮浘<-------璺ㄥ煙----------->
+ public ServiceModel serchByCondition_ky(Object obj){
+ Batttestdata btd=(Batttestdata)obj;
+ btd.setRecord_num(0);
+ btd.setNum(0);
+ btd.setTest_type(0);
+ if(btd.getBattGroupId()!=null && btd.getTest_record_count()!=null){
+ List<Batttestdata> listM=(new BatttestdataDAOImpl()).serchMaxAndMintime(btd);
+ if(listM!=null&&listM.size()>0){
+ btd.setNum(listM.get(listM.size()-1).getNum());
+ btd.setTest_type(listM.get(listM.size()-1).getTest_type());
+ btd.setRecord_num(listM.get(listM.size()-1).getRecord_num());
+ }
+ List<List<Batttestdata>> list = ((BatttestdataDAOImpl)dao).serchByCondition_ky(btd);
+ if(list!=null && list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ }
+ return model;
+ }
public List checkBattTestData(Object obj){
List listnew = new ArrayList<Batttestdata>();
List<Batttestdata> list = (List<Batttestdata>)obj;
@@ -54,10 +82,11 @@
public static void main(String[] args) {
Batttestdata b = new Batttestdata();
- b.setBattGroupId(1000010);
- b.setTest_record_count(37);
+ b.setBattGroupId(1002085);
+ b.setTest_record_count(1);
BatttestdataService service = new BatttestdataService();
- service.serchByCondition(b);
+ ServiceModel model=service.serchByCondition_ky(b);
+ System.out.println(model.getData());
}
}
--
Gitblit v1.9.1