From 5982c6a6be704abc2bb5d543b1a51be8cfd46122 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期一, 17 四月 2023 15:32:21 +0800
Subject: [PATCH] 修复在初始安装数据库时存在某些表不存在提前终止

---
 BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java b/BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java
index 67bbeec..5f02209 100644
--- a/BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java
+++ b/BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java
@@ -145,7 +145,7 @@
 				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.A059_Station_Inf_TABLE 
 						+ " ADD COLUMN `station_type` int(11) NOT NULL DEFAULT '0' COMMENT '机房类型[0:充放电一体机;1:FBO4830]';");
 			}
-		} catch (SQLException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
 			if(null != res) {
@@ -2290,10 +2290,10 @@
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		ResultSet res= null;
 		ResultSet res1= null;
-		res = sql.sqlMysqlQuery(sql_str_sel);
-		StringBuffer sql_strs = new StringBuffer(" INSERT INTO " + Sql_Mysql.Station_Inf_Table + "(stationId,stationName1,stationName2,stationName3,stationName4,stationName5,stationName,nodeStation,stationType,stationLongitude,stationLatitude,stationAddr) VALUES ");
- 		int sta_cnt = 0;
 		try {
+			res = sql.sqlMysqlQuery(sql_str_sel);
+			StringBuffer sql_strs = new StringBuffer(" INSERT INTO " + Sql_Mysql.Station_Inf_Table + "(stationId,stationName1,stationName2,stationName3,stationName4,stationName5,stationName,nodeStation,stationType,stationLongitude,stationLatitude,stationAddr) VALUES ");
+			int sta_cnt = 0;
 			while(res.next()) {
 				String StationId = res.getString("StationId").trim();
 				String StationName = res.getString("StationName");
@@ -2331,7 +2331,7 @@
 				//System.out.println(sql_strs.toString());
 				sql.sqlMysqlExecute(sql_strs.toString());
 			}
-		} catch (SQLException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
 			if(null != res) {
@@ -2363,11 +2363,11 @@
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		ResultSet res= null;
 		ResultSet res1= null;
-		res = sql.sqlMysqlQuery(sql_str_sel);
-		StringBuffer sql_strs = new StringBuffer(" INSERT INTO " + Sql_Mysql.Station_Inf_Table + "(stationId,stationName1,stationName2,stationName3,stationName4,stationName5,stationName,nodeStation,stationType,stationLongitude,stationLatitude,stationAddr) VALUES ");
- 		int sta_cnt = 0;
 		try {
-			while(res.next()) {
+			res = sql.sqlMysqlQuery(sql_str_sel);
+			StringBuffer sql_strs = new StringBuffer(" INSERT INTO " + Sql_Mysql.Station_Inf_Table + "(stationId,stationName1,stationName2,stationName3,stationName4,stationName5,stationName,nodeStation,stationType,stationLongitude,stationLatitude,stationAddr) VALUES ");
+			int sta_cnt = 0;
+			while(null !=res && res.next()) {
 				String StationId = res.getString("StationId").trim();
 				String StationName = res.getString("StationName");
 				String StationName1 = res.getString("StationName1");
@@ -2401,7 +2401,7 @@
 				//System.out.println(sql_strs.toString());
 				sql.sqlMysqlExecute(sql_strs.toString());
 			}
-		} catch (SQLException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
 			if(null != res) {
@@ -2440,7 +2440,7 @@
 				//System.out.println("StationId:"+stationId);
 				flag = true;
 			}
-		} catch (SQLException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
 			if(null != res2) {

--
Gitblit v1.9.1