From 8c29d7514b6bc5c5c29e77a59726a51248744a0c Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期一, 16 八月 2021 12:03:00 +0800
Subject: [PATCH] V1.102 	1.为兼容老版本fuguang.war平台和fg.war平台的控制功能

---
 BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread_SQL.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread_SQL.java b/BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread_SQL.java
index f837d33..2805c32 100644
--- a/BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread_SQL.java
+++ b/BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread_SQL.java
@@ -82,7 +82,7 @@
 	 * @param dev_id
 	 * @return
 	 */
-	public static FBS9600S_SystemState queryFBS9600SSysCmd(MysqlConnPool pool,int dev_id) {
+	public static FBS9600S_SystemState queryFBS9100SSysCmd(MysqlConnPool pool,int dev_id) {
 		FBS9600S_SystemState state = new FBS9600S_SystemState("", dev_id);
 		String sql_str = "SELECT * from db_ram_db.tb_fbs9100_state WHERE dev_id = "+dev_id;
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
@@ -120,6 +120,55 @@
 		}
 	}
 	
+	/**
+	 * 	查询9600State
+	 * @param con_pool
+	 * @param sysState
+	 */
+	public static FBS9600S_SystemState queryFbs9600StateCmdBydev_id(MysqlConnPool con_pool, int dev_id)
+	{
+		FBS9600S_SystemState sys = new FBS9600S_SystemState("", dev_id);
+		String sql_str = " select * from " + Sql_Mysql.FBS9600State_Table + " "
+				       + " where dev_id= " + dev_id;
+		Sql_Mysql sql = new Sql_Mysql(con_pool.getConn());
+		ResultSet res = null;
+		try {
+			res = sql.sqlMysqlQuery(sql_str);
+			if(res.next()) {				
+				sys.op_cmd = res.getInt("op_cmd"); 
+			}
+		} catch (SQLException e) {
+			//e.printStackTrace();
+		} finally {
+			if(null != res) {
+				 try {
+					res.close();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
+			sql.close_con();
+		}
+		return sys;
+	}
+	
+	public static void updateFbs9600StateCmdBydev_id(MysqlConnPool con_pool, FBS9600S_SystemState sysState)
+	{
+		String sql_str_base = Sql_Mysql.FBS9600State_Table + " SET "
+							+ "dev_id=" + sysState.dev_id + ", "
+							+ "op_cmd=" + sysState.op_cmd;
+		String sql_str_update = "UPDATE " + sql_str_base + " WHERE dev_id = " + sysState.dev_id;
+		//String sql_str_replace = "REPLACE INTO " + sql_str_base;
+		Sql_Mysql sql = new Sql_Mysql(con_pool.getConn());
+		try {
+			sql.sqlMysqlExecute(sql_str_update);
+		} catch (SQLException e) {
+			//e.printStackTrace();
+		} finally {
+			sql.close_con();
+		}
+	}
+	
 	
 	/**
 	 * 根据获取当前设备的命令
@@ -127,7 +176,7 @@
 	 * @param dev_id
 	 * @return
 	 */
-	public static FBS9600S_SystemState queryFBS9600SSetParam(MysqlConnPool pool,int dev_id) {
+	public static FBS9600S_SystemState queryFBS9100SSetParam(MysqlConnPool pool,int dev_id) {
 		FBS9600S_SystemState state = new FBS9600S_SystemState("", dev_id);
 		String sql_str = "SELECT * from db_ram_db.tb_fbs9100_setparam WHERE dev_id = "+dev_id;
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());

--
Gitblit v1.9.1