From 9cff7eda096934d7d0182d7d14161336cdf48bf2 Mon Sep 17 00:00:00 2001 From: lzz <xiguabobo_2020@qq.com> Date: 星期五, 08 十一月 2024 12:28:55 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025 --- kunlun.sql | 87 ++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 46 deletions(-) diff --git a/kunlun.sql b/kunlun.sql index 0187f15..9d4750b 100644 --- a/kunlun.sql +++ b/kunlun.sql @@ -22,14 +22,17 @@ -- 瀵煎嚭 琛� mayi_kunlun.data_info 缁撴瀯 CREATE TABLE IF NOT EXISTS `data_info` ( `id` int NOT NULL AUTO_INCREMENT, - `device_id` int DEFAULT NULL, - `type` varchar(50) DEFAULT NULL, + `device_name` varchar(50) DEFAULT NULL, + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `data` float DEFAULT NULL, - `time` datetime DEFAULT NULL, + `time` varchar(50) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鏁版嵁'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鏁版嵁'; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.data_info 鐨勬暟鎹細~0 rows (澶х害) +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.data_info 鐨勬暟鎹細~2 rows (澶х害) +INSERT INTO `data_info` (`id`, `device_name`, `type`, `data`, `time`) VALUES + (1, '鍒�', '浣嗘槸', 1, '1'), + (2, '鐜�', ' 鐨�', 2, '2'); -- 瀵煎嚭 琛� mayi_kunlun.devices_management_info 缁撴瀯 CREATE TABLE IF NOT EXISTS `devices_management_info` ( @@ -41,19 +44,22 @@ `area` varchar(50) DEFAULT NULL, `longitude` double DEFAULT NULL, `latitude` double DEFAULT NULL, - `purchasing_time` varchar(50) DEFAULT NULL, - `install_time` varchar(50) DEFAULT NULL, + `purchasing_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `install_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `manufacturer` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `mark_name` varchar(50) DEFAULT NULL, `mark_time` varchar(50) DEFAULT NULL, + `mark_status` int DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.devices_management_info 鐨勬暟鎹細~3 rows (澶х害) -INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_name`, `mark_time`) VALUES - (2, '12', '3', '2', '2', '3', 4, 6, '6', '3', '3', NULL, NULL), - (3, '3', '1', '3', '3', '1', 2, 5, '6', '3', '6', NULL, NULL), - (4, '10', '1', '3', '3', '1', 2, 5, '9', '3', '6', NULL, NULL); +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.devices_management_info 鐨勬暟鎹細~6 rows (澶х害) +INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_time`, `mark_status`) VALUES + (6, '6', '6', '6', '6', '8', 8, 8, '8', '8', '8', NULL, NULL), + (7, '1', '4', '4', '2', '6', 6, 9, '9', '2', '2', NULL, NULL), + (8, '1', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL), + (9, '10', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL), + (10, '6', '5', '5', '5', '5', 5, 5, '5', '5', '5', NULL, NULL), + (12, '312', '231', '324', '1321', '312', 312, 321, '2024-01-01', '2024-01-01', '3124', NULL, NULL); -- 瀵煎嚭 琛� mayi_kunlun.month_info 缁撴瀯 CREATE TABLE IF NOT EXISTS `month_info` ( @@ -70,7 +76,7 @@ -- 瀵煎嚭 琛� mayi_kunlun.parsed_logs 缁撴瀯 CREATE TABLE IF NOT EXISTS `parsed_logs` ( `id` int NOT NULL AUTO_INCREMENT, - `time_stamp` timestamp NOT NULL DEFAULT (0), + `time_stamp` varchar(50) NOT NULL DEFAULT '0', `device_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `level` varchar(16) NOT NULL, `content` varchar(256) NOT NULL, @@ -79,9 +85,12 @@ `problem_line` int NOT NULL, `function_name` varchar(64) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.parsed_logs 鐨勬暟鎹細~0 rows (澶х害) +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.parsed_logs 鐨勬暟鎹細~2 rows (澶х害) +INSERT INTO `parsed_logs` (`id`, `time_stamp`, `device_id`, `level`, `content`, `user_id`, `file_name`, `problem_line`, `function_name`) VALUES + (1, '2024-05-10 10:05:06', '5', '5', '5', '5', '5', 7, '5'), + (2, '2020-05-01 11:05:02', '2', '3', '6', '3', '1', 2, '3'); -- 瀵煎嚭 琛� mayi_kunlun.production_plan 缁撴瀯 CREATE TABLE IF NOT EXISTS `production_plan` ( @@ -117,24 +126,14 @@ -- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.role_info 鐨勬暟鎹細~0 rows (澶х害) --- 瀵煎嚭 琛� mayi_kunlun.student 缁撴瀯 -CREATE TABLE IF NOT EXISTS `student` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(50) DEFAULT NULL, - `age` int DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; - --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.student 鐨勬暟鎹細~0 rows (澶х害) - -- 瀵煎嚭 琛� mayi_kunlun.threshold_info 缁撴瀯 CREATE TABLE IF NOT EXISTS `threshold_info` ( `id` int NOT NULL AUTO_INCREMENT, - `device_id` int DEFAULT NULL, - `min_threshold` float DEFAULT NULL, - `max_threshold` float DEFAULT NULL, + `device_name` varchar(50) DEFAULT NULL, `type` varchar(50) DEFAULT NULL, - `time` datetime DEFAULT NULL, + `min` float DEFAULT NULL, + `max` float DEFAULT NULL, + `time` varchar(50) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='闃堝��'; @@ -145,7 +144,7 @@ `id` int NOT NULL AUTO_INCREMENT, `department` varchar(50) DEFAULT NULL, `user_name` varchar(32) DEFAULT NULL, - `password` varchar(32) DEFAULT NULL, + `password` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `user_no` varchar(10) DEFAULT NULL, `age` int DEFAULT NULL, `sex` varchar(10) DEFAULT NULL, @@ -156,6 +155,7 @@ `login_time` datetime DEFAULT NULL, `register_time` datetime DEFAULT NULL, PRIMARY KEY (`id`), + UNIQUE KEY `unique_constraint_name` (`user_name`), KEY `role_id` (`role_id`), CONSTRAINT `user_info_ibfk_1` FOREIGN KEY (`role_id`) REFERENCES `role_info` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; @@ -184,35 +184,30 @@ `version_description` char(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', `version_creatime` datetime NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.version_info 鐨勬暟鎹細~2 rows (澶х害) +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.version_info 鐨勬暟鎹細~3 rows (澶х害) INSERT INTO `version_info` (`id`, `version_id`, `version_id_old`, `version_description`, `version_creatime`) VALUES (1, '1.3', '1.3', '225', '2024-10-29 15:47:00'), (2, '1.4', '1.4', '226', '2024-10-30 02:47:30'), (3, '1.5', '1.5', '227', '2024-11-01 15:48:18'); --- 瀵煎嚭 琛� mayi_kunlun.warningdata_info 缁撴瀯 -CREATE TABLE IF NOT EXISTS `warningdata_info` ( +-- 瀵煎嚭 琛� mayi_kunlun.warning_info 缁撴瀯 +CREATE TABLE IF NOT EXISTS `warning_info` ( `id` int NOT NULL AUTO_INCREMENT, - `device_id` int NOT NULL, + `device_name` varchar(50) NOT NULL DEFAULT '', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, `des` varchar(50) NOT NULL, - `time` datetime NOT NULL, - `warningdata` float NOT NULL, - `type` varchar(50) NOT NULL, + `warning_data` float NOT NULL, + `time` varchar(50) NOT NULL DEFAULT '', `status` varchar(50) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='璀︽姤鏁版嵁'; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.warningdata_info 鐨勬暟鎹細~0 rows (澶х害) +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.warning_info 鐨勬暟鎹細~0 rows (澶х害) /*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */; /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */; -<<<<<<< HEAD -z -======= -SELECT id,devices_name,longitude,latitude,devices_status FROM devices_management; ->>>>>>> 2e420a0a40cc3fcc62bcb42ee6a25f4ad4f22dd3 -- Gitblit v1.8.0