From 5c3e9ca324155efb5461ee48ad591a1070d6ae5e Mon Sep 17 00:00:00 2001
From: whyclxw <http://whyclxw@118.89.139.230:10101/r/~whyclxw/IdeaTest.git>
Date: 星期四, 02 九月 2021 17:43:16 +0800
Subject: [PATCH] 11

---
 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java
index f23620d..b3721a4 100644
--- a/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java
+++ b/BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java
@@ -9,6 +9,7 @@
 import com.battmonitor.sql.Com;
 import com.battmonitor.sql.MysqlConnPool;
 import com.battmonitor.sql.Sql_Mysql;
+import com.dev.fgcd.data.FGCD_ComBase;
 import com.dev.fgcd.data.FGCD_TestFBOFile;
 import com.dev.fgcd.data.FGCD_TestFBOFile.FBOFile;
 import com.dev.fgcd.fbo.FboData;
@@ -16,7 +17,39 @@
 import com.mchange.v2.resourcepool.ResourcePoolListener;
 
 public class FGCD_Task_Thread_SQL {
-  	
+	/**
+	 * 	查询当前op_cmd
+	 * @param pool
+	 * @param BattGroupId
+	 * @return
+	 */
+	public static int quereyDownLoadState_UserCancel(MysqlConnPool pool,int battgroupid) {
+		int op_cmd = 0;
+		String sql_str = " SELECT op_cmd " + 
+						 " FROM " + Sql_Mysql.Tb_Fgcd_Filedownload_Table +
+						 " WHERE BattGroupId = " + battgroupid;
+		Sql_Mysql sql = new Sql_Mysql(pool);
+		ResultSet res = null;
+		try {
+			res = sql.sqlMysqlQuery(sql_str);
+			if(res.next()) {
+				op_cmd = res.getInt("op_cmd");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			if(null != res) {
+				try {
+					res.close();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
+			sql.close_con();
+		}
+		return op_cmd;
+	}
+
 	/**
 	 * 	插入FBO历史数据
 	 * @param pool
@@ -307,7 +340,7 @@
 	//文件导入状态
 	public static void updateFBOStateByOneSql(MysqlConnPool pool,int download_flag,int download_state,FGCD_TestFBOFile fbofile,int file_downloadNum) {
 		String sql_str = " update " + Sql_Mysql.Tb_Fgcd_Filedownload_Table +
-						 " set download_flag"+(file_downloadNum+1)+"="+download_flag+",download_state"+(file_downloadNum+1)+"="+download_state+" WHERE BattGroupId = " + fbofile.battgroupid+" and dev_id="+fbofile.dev_id;
+						 " set op_cmd="+FGCD_ComBase.CMD_DownLoadFBDFile_Over_ACK+",download_flag"+(file_downloadNum+1)+"="+download_flag+",download_state"+(file_downloadNum+1)+"="+download_state+" WHERE BattGroupId = " + fbofile.battgroupid+" and dev_id="+fbofile.dev_id;
 		Sql_Mysql sql = new Sql_Mysql(pool);
 		try {
 			sql.sqlMysqlExecute(sql_str);
@@ -343,10 +376,12 @@
 	 * @param pool
 	 * @param file
 	 */
-	public static void updateFgcd_Filedownload_TableCmdByDevId(MysqlConnPool pool,FGCD_TestFBOFile file) {
+	public static void updateFgcd_Filedownload_TableCmdByDevId(MysqlConnPool pool,FGCD_TestFBOFile file,int file_downloadNum) {
 		String sql_str = " UPDATE " + Sql_Mysql.Tb_Fgcd_Filedownload_Table +
 						 " SET op_cmd =  " + file.op_cmd +
 						 " ,stop_reason =  " + file.getStop_reason() +
+						 " ,download_flag"+(file_downloadNum+1)+" =  " + file.files[file_downloadNum].download_flag +
+						 " ,download_state"+(file_downloadNum+1)+" =  " + file.files[file_downloadNum].download_state +
 						 " WHERE dev_id =  " + file.dev_id;
 		Sql_Mysql sql = new Sql_Mysql(pool);
 		try {

--
Gitblit v1.9.1