From 422d605116ab7dad69a295e23cb132d5e3684b24 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期二, 14 十二月 2021 09:26:38 +0800
Subject: [PATCH] 升级log4j开源包

---
 Central_Monitor/src/com/data/Comm/Central_Data_Task_SQL.java |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/Central_Monitor/src/com/data/Comm/Central_Data_Task_SQL.java b/Central_Monitor/src/com/data/Comm/Central_Data_Task_SQL.java
index fe7656c..144c2a5 100644
--- a/Central_Monitor/src/com/data/Comm/Central_Data_Task_SQL.java
+++ b/Central_Monitor/src/com/data/Comm/Central_Data_Task_SQL.java
@@ -1,5 +1,6 @@
 package com.data.Comm;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import com.sql.MysqlConnPool;
@@ -10,13 +11,17 @@
 	public static void init(MysqlConnPool pool) {
 		CreateDB_MW_Motor(pool);
 		
-		CreateDB_MW_Motor_History(pool);		
+		CreateDB_MW_Motor_History(pool);
+		
+		CreateTb_MW_Motor_inf(pool);
 		
 		CreateTb_Central_Monitor_Sys_StTable(pool);
 		
 		CreateTb_Central_Monitor_Sys_RtTable(pool);
 		
 		CreateTb_Central_Monitor_Sys_ControlTable(pool);
+		
+		CreateTb_Device_StateTable(pool);
 	}
 	
 	/**
@@ -44,6 +49,109 @@
 			sql.sqlMysqlExecute(" CREATE DATABASE IF NOT EXISTS " + Sql_Mysql.DB_MW_Motor_History);
 		} catch (SQLException e) {
 			sql.logger.error(e.toString(),e);
+		} finally {
+			sql.close_con();
+		}
+	}
+	
+	/**
+	 * 创建设备信息表
+	 * @param pool
+	 */
+	public static void CreateTb_MW_Motor_inf(MysqlConnPool pool) {
+		String sql_str = " CREATE TABLE IF NOT EXISTS " + Sql_Mysql.Tb_MW_Motor_inf + " (" + 
+				"  num bigint(20) NOT NULL AUTO_INCREMENT," + 
+				"  sys_id int(11) NOT NULL DEFAULT '100001' COMMENT '系统id'," + 
+				"  sys_name varchar(32) NOT NULL DEFAULT '' COMMENT '系统名称'," + 
+				"  dev_id int(11) NOT NULL DEFAULT '10001' COMMENT '设备id'," + 
+				"  dev_name varchar(32) NOT NULL DEFAULT '' COMMENT '设备名称'," + 
+				"  dev_ip varchar(32) NOT NULL DEFAULT '' COMMENT '设备ip'," + 
+				"  note varchar(32) NOT NULL DEFAULT '' COMMENT '备用'," + 
+				"  PRIMARY KEY (num)," + 
+				"  UNIQUE KEY index_dev_id (dev_id) USING BTREE" + 
+				") ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8; ";
+		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		ResultSet res = null;
+		try {
+			//创建数据库表
+			sql.sqlMysqlExecute(sql_str);
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 10001;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100001', '集中监控系统', '10001', '5000kVA进线屏', '192.168.10.221');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 10002;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100001', '集中监控系统', '10002', '5000kVA出线屏', '192.168.10.222');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 10003;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100001', '集中监控系统', '10003', '1号3200kVA出线屏', '192.168.10.222');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 10004;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100001', '集中监控系统', '10004', '2号3200kVA出线屏', '192.168.10.222');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 10005;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100001', '集中监控系统', '10005', '直流主配电板', '192.168.10.222');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 20001;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100002', 'AFE变频器', '20001', '整流与测控系统', '192.168.10.222');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 20002;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100002', 'AFE变频器', '20002', '逆变与测控系统', '192.168.10.221');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 30001;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100003', '4MW大功率整流电源', '30001', '1号4MW大功率整流电源', '127.0.0.1');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 40001;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100004', '试验台润滑冷却系统', '40001', '油站通讯', '127.0.0.1');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 40002;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100004', '试验台润滑冷却系统', '40002', '水站通讯', '127.0.0.1');");
+			}
+			res = sql.sqlMysqlQuery("SELECT * FROM "+Sql_Mysql.Tb_MW_Motor_inf+" WHERE dev_id = 40003;");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Tb_MW_Motor_inf + "(sys_id,sys_name,dev_id,dev_name,dev_ip) VALUES ('100004', '试验台润滑冷却系统', '40003', 'ups通讯', '127.0.0.1');");
+			}			
+		} catch (SQLException e) {
+			if(null != res) {
+				try {
+					res.close();
+				} catch (SQLException e1) {
+					sql.logger.error(e.toString(), e1);
+				}
+			}
+			sql.logger.error(e.toString(), e);
+		} finally {
+			sql.close_con();
+		}
+	}
+	
+	
+	/**
+	 * 	创建Tb_Device_State表
+	 * @param pool
+	 */
+	public static void CreateTb_Device_StateTable(MysqlConnPool pool) {
+		String sql_str = "CREATE TABLE IF NOT EXISTS "+Sql_Mysql.Tb_Device_State+" (" + 
+				"  num bigint(20) NOT NULL AUTO_INCREMENT," + 
+				"  dev_id int(11) NOT NULL DEFAULT '10001' COMMENT '设备id'," + 
+				"  record_time datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '记录时间'," + 
+				"  comm_status int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态(0:通讯故障;1:通讯正常)'," + 
+				"  note varchar(64) NOT NULL DEFAULT ''," + 
+				"  PRIMARY KEY (num)" + 
+				") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		try {
+			sql.sqlMysqlExecute(sql_str);
+		} catch (SQLException e) {
+			sql.logger.error(e.toString(), e);
 		} finally {
 			sql.close_con();
 		}
@@ -79,7 +187,7 @@
 				"  vol_b float NOT NULL DEFAULT '0' COMMENT 'B排电压'," + 
 				"  note varchar(255) NOT NULL DEFAULT '' COMMENT '备用'," + 
 				"  PRIMARY KEY (num)," + 
-				"  KEY `index_dev_id` (`dev_id`) USING BTREE" + 
+				"  KEY index_dev_id (dev_id) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		try {
@@ -107,7 +215,7 @@
 				"  panel_curr float(11,0) NOT NULL DEFAULT '0' COMMENT '进线屏电流'," + 
 				"  note varchar(255) NOT NULL DEFAULT '0' COMMENT '备用'," + 
 				"  PRIMARY KEY (num)," + 
-				"  KEY `index_dev_id` (`dev_id`) USING BTREE" + 
+				"  KEY index_dev_id (dev_id) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		try {
@@ -139,7 +247,7 @@
 				"  switch_close_2st_2500A_load int(11) NOT NULL DEFAULT '0' COMMENT '2号2500A负载屏开关合闸'," + 
 				"  switch_open_2st_2500A_load int(11) NOT NULL DEFAULT '0' COMMENT '2号2500A负载屏开关分闸'," + 
 				"  PRIMARY KEY (num)," + 
-				"  KEY `index_dev_id` (`dev_id`) USING BTREE" + 
+				"  KEY index_dev_id (dev_id) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		try {

--
Gitblit v1.9.1