From 86397b404b0f18da000b2eb9ad64a5cbedb4cc93 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 18 十一月 2019 10:04:15 +0800
Subject: [PATCH] 后台提交

---
 platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java |  257 ++++++++++++++++++++++++--------------------------
 1 files changed, 123 insertions(+), 134 deletions(-)

diff --git a/platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java b/platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java
index 87dc653..2ba3292 100644
--- a/platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java
+++ b/platforms/android/app/src/main/java/com/fgkj/impl/Batttestdata_infDAOImpl.java
@@ -1,5 +1,6 @@
 package com.fgkj.impl;
 
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import java.sql.Connection;
@@ -11,6 +12,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.fgkj.dao.ActionUtil;
 import com.fgkj.dao.BaseDAO;
 import com.fgkj.dao.BattTestData;
 import com.fgkj.dto.Batttestdata_inf;
@@ -20,39 +22,43 @@
 
 
 public class Batttestdata_infDAOImpl implements BaseDAO, CallBack {
-	private SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	
 	//鍚慴atttestdata_inf琛ㄤ腑娣诲姞鏁版嵁
 	public boolean add(SQLiteDatabase db,Object obj) {
 		Batttestdata_inf b=(Batttestdata_inf)obj;
 		String sql="insert into tb_batttestdata_inf(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) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-		return DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{
-			b.getBattGroupId(),
-			b.getTest_record_count(),
-			b.getTest_record_count_ex(),
-			b.getTest_type(),
-			b.getRecord_time_interval(),
-			b.getData_new(),
-			b.getData_available(),
-			b.getRecord_num(),
-			b.getTest_starttime(),
-			b.getTest_starttime_ex(),
-			b.getTest_starttype(),
-			b.getRecord_time(),
-			b.getTest_timelong(),
-			b.getTest_stoptype(),
-			b.getGroup_vol(),
-			b.getTest_curr(),
-			b.getTest_cap(),
-			b.getMax_monnum(),
-			b.getMax_monvol(),
-			b.getMin_monnum(),
-			b.getMin_monvol(),
-			b.getMon_num(),
-			b.getMon_vol(),
-			b.getUpload_usr_id()
-		});
-		
+		boolean bl=true;
+		try {
+			db.execSQL(sql,new Object[]{
+					b.getBattGroupId(),
+					b.getTest_record_count(),
+					b.getTest_record_count_ex(),
+					b.getTest_type(),
+					b.getRecord_time_interval(),
+					b.getData_new(),
+					b.getData_available(),
+					b.getRecord_num(),
+					b.getTest_starttime(),
+					b.getTest_starttime_ex(),
+					b.getTest_starttype(),
+					b.getRecord_time(),
+					b.getTest_timelong(),
+					b.getTest_stoptype(),
+					b.getGroup_vol(),
+					b.getTest_curr(),
+					b.getTest_cap(),
+					b.getMax_monnum(),
+					b.getMax_monvol(),
+					b.getMin_monnum(),
+					b.getMin_monvol(),
+					b.getMon_num(),
+					b.getMon_vol(),
+					b.getUpload_usr_id()
+			});
+		} catch (android.database.SQLException e) {
+			bl=false;
+			e.printStackTrace();
+		}
+		return  bl;
 	}
 	
 	public boolean update(SQLiteDatabase db,Object obj) {
@@ -60,124 +66,111 @@
 		return false;
 	}
 
-	//6.1鐢垫睜鍏呮斁鐢靛垹闄ゆ搷浣�
+	//鐢垫睜鍏呮斁鐢靛垹闄よ褰�
 	public boolean del(SQLiteDatabase db,Object obj) {
 		Batttestdata_inf tdata=(Batttestdata_inf)obj;
+		boolean bl=true;
 		String sql="delete from tb_batttestdata_inf where num=?";
-		return DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{tdata.getNum()});
-	}
-	 //鐢垫睜鍏�/鏀剧數鏁版嵁绠$悊鍒犻櫎
-	public String delPro(SQLiteDatabase db,Object obj) {
-		Batttestdata_inf tdata=(Batttestdata_inf)obj;
-		String sql="delete from tb_batttestdata_inf where num="+tdata.getNum();
-	    return sql;
+		try {
+			db.execSQL(sql, new Object[]{tdata.getNum()});
+		} catch (android.database.SQLException e) {
+			bl=false;
+			e.printStackTrace();
+		}
+		return bl;
 	}
 	//鏌ヨ鎵�鏈夌殑鍏呮斁鐢典俊鎭�
 	public List searchAll(SQLiteDatabase db) {
 		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 tb_batttestdata_inf " +
 				" where tb_batttestdata_inf.data_available=1 ";
-		return DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+		Cursor rs=db.rawQuery(sql,new String[]{});
+		List list=new ArrayList();
+		try {
+			while(rs.moveToNext()){
+				Batttestdata_inf b=new Batttestdata_inf();
+				b.setNum(rs.getInt(rs.getColumnIndex("num")));
+				b.setBattGroupId(rs.getInt(rs.getColumnIndex("BattGroupId")));
+				b.setTest_record_count(rs.getInt(rs.getColumnIndex("test_record_count")));
+				b.setTest_record_count_ex(rs.getInt(rs.getColumnIndex("test_record_count_ex")));
+				b.setTest_type(rs.getInt(rs.getColumnIndex("test_type")));
+				b.setRecord_time_interval(rs.getInt(rs.getColumnIndex("record_time_interval")));
+				b.setData_new(rs.getInt(rs.getColumnIndex("data_new")));
+				b.setData_available(rs.getInt(rs.getColumnIndex("data_available")));
+				b.setRecord_num(rs.getInt(rs.getColumnIndex("record_num")));
+				
+				b.setTest_starttime(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("test_starttime"))));
+				b.setTest_starttime_ex(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("test_starttime_ex"))));
+				b.setTest_starttype(rs.getInt(rs.getColumnIndex("test_starttype")));
+				b.setRecord_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("record_time"))));
 			
-			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"));
-						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);
-						//System.out.println(b);
-					}
-				} catch (SQLException e) {
-					e.printStackTrace();
-				} 
-				return list;
+				b.setTest_timelong(rs.getInt(rs.getColumnIndex("test_timelong")));
+				b.setTest_stoptype(rs.getInt(rs.getColumnIndex("test_stoptype")));
+				b.setGroup_vol(rs.getFloat(rs.getColumnIndex("group_vol")));
+				b.setTest_curr(rs.getFloat(rs.getColumnIndex("test_curr")));
+				b.setTest_cap(rs.getFloat(rs.getColumnIndex("test_cap")));
+				b.setMax_monnum(rs.getInt(rs.getColumnIndex("max_monnum")));
+				b.setMax_monvol(rs.getFloat(rs.getColumnIndex("max_monvol")));
+				b.setMin_monnum(rs.getInt(rs.getColumnIndex("min_monnum")));
+				b.setMin_monvol(rs.getFloat(rs.getColumnIndex("min_monvol")));
+				b.setMon_num(rs.getInt(rs.getColumnIndex("mon_num")));
+				b.setMon_vol(rs.getFloat(rs.getColumnIndex("mon_vol")));
+				b.setUpload_usr_id(rs.getInt(rs.getColumnIndex("upload_usr_id")));
+				list.add(b);
 			}
-		});
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		rs.close();
+		return  list;
 	}
 
-	//鍘嗗彶鏁版嵁鏌ヨ
+	//鏍规嵁battfroupid鏌ヨ鍘嗗彶鏁版嵁鏌ヨ
 	public List serchByCondition(SQLiteDatabase db,Object obj) {
-	    final Batttestdata_inf bti=(Batttestdata_inf)obj;
-		String sql="select tb_batttestdata_inf.num,tb_batttestdata_inf.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"
+		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 tb_batttestdata_inf where "
-				+" tb_batttestdata_inf.data_available=1 " +
+				+" data_available=1 and BattGroupId=? " +
 				" 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"));
-						b.setMoncapstd(rs.getFloat("MonCapStd"));
-						b.setMonvolstd(rs.getFloat("monvolstd"));
-						list.add(b);
-					}
-				} catch (SQLException e) {
-					e.printStackTrace();
-				} 
-				return list;
+		List list=new ArrayList();
+		Cursor rs=db.rawQuery(sql,new String[]{String.valueOf(bti.getBattGroupId())});
+		try {
+			while(rs.moveToNext()){
+				Batttestdata_inf b=new Batttestdata_inf();
+				b.setNum(rs.getInt(rs.getColumnIndex("num")));
+				b.setBattGroupId(rs.getInt(rs.getColumnIndex("BattGroupId")));
+				b.setTest_record_count(rs.getInt(rs.getColumnIndex("test_record_count")));
+				b.setTest_record_count_ex(rs.getInt(rs.getColumnIndex("test_record_count_ex")));
+				b.setTest_type(rs.getInt(rs.getColumnIndex("test_type")));
+				b.setRecord_time_interval(rs.getInt(rs.getColumnIndex("record_time_interval")));
+				b.setData_new(rs.getInt(rs.getColumnIndex("data_new")));
+				b.setData_available(rs.getInt(rs.getColumnIndex("data_available")));
+				b.setRecord_num(rs.getInt(rs.getColumnIndex("record_num")));
+	
+				b.setTest_starttime(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("test_starttime"))));
+				b.setTest_starttime_ex(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("test_starttime_ex"))));
+				b.setTest_starttype(rs.getInt(rs.getColumnIndex("test_starttype")));
+				b.setRecord_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("record_time"))));
+	
+				b.setTest_timelong(rs.getInt(rs.getColumnIndex("test_timelong")));
+				b.setTest_stoptype(rs.getInt(rs.getColumnIndex("test_stoptype")));
+				b.setGroup_vol(rs.getFloat(rs.getColumnIndex("group_vol")));
+				b.setTest_curr(rs.getFloat(rs.getColumnIndex("test_curr")));
+				b.setTest_cap(rs.getFloat(rs.getColumnIndex("test_cap")));
+				b.setMax_monnum(rs.getInt(rs.getColumnIndex("max_monnum")));
+				b.setMax_monvol(rs.getFloat(rs.getColumnIndex("max_monvol")));
+				b.setMin_monnum(rs.getInt(rs.getColumnIndex("min_monnum")));
+				b.setMin_monvol(rs.getFloat(rs.getColumnIndex("min_monvol")));
+				b.setMon_num(rs.getInt(rs.getColumnIndex("mon_num")));
+				b.setMon_vol(rs.getFloat(rs.getColumnIndex("mon_vol")));
+				b.setUpload_usr_id(rs.getInt(rs.getColumnIndex("upload_usr_id")));
+				list.add(b);
 			}
-		});
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		rs.close();
+		return list;
 	}
 	
 	public List serchByInfo(SQLiteDatabase db,Object obj) {
@@ -192,9 +185,5 @@
 
 	public static void main(String[] args) {
 		Batttestdata_infDAOImpl bimpl=new Batttestdata_infDAOImpl();
-		/*List<Batttestdata_inf> list=bimpl.searchAll();
-		for (Batttestdata_inf b:list) {
-			System.out.println(b);
-		}*/
 	}
 }

--
Gitblit v1.9.1