From 701ab99293a5d9f709a999eca81a625426adb46d Mon Sep 17 00:00:00 2001 From: wxx <1321839169@qq.com> Date: 星期二, 05 十一月 2024 15:02:15 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025 --- 表.docx | 0 Server/李转转/log/配置管理_李转转_1105.doc | 0 Client/宋昊昳/log/日志_宋昊昳_1105.doc | 0 kunlun110401.sql | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++ Client/刘子航/log/日志_刘子航_1105.doc | 0 Server/陈楚丹/log/日志_陈楚丹_1104.doc | 0 Client/郑凯文/log/郑凯文1105.doc | 0 7 files changed, 200 insertions(+), 0 deletions(-) diff --git "a/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1105.doc" "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1105.doc" new file mode 100644 index 0000000..fe64693 --- /dev/null +++ "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1105.doc" Binary files differ diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1105.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1105.doc" new file mode 100644 index 0000000..40827ce --- /dev/null +++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1105.doc" Binary files differ diff --git "a/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071105.doc" "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071105.doc" new file mode 100644 index 0000000..6888c5d --- /dev/null +++ "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071105.doc" Binary files differ diff --git "a/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1105.doc" "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1105.doc" new file mode 100644 index 0000000..7eb435b --- /dev/null +++ "b/Server/\346\235\216\350\275\254\350\275\254/log/\351\205\215\347\275\256\347\256\241\347\220\206_\346\235\216\350\275\254\350\275\254_1105.doc" Binary files differ diff --git "a/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1104.doc" "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1104.doc" new file mode 100644 index 0000000..6ab23ea --- /dev/null +++ "b/Server/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1104.doc" Binary files differ diff --git a/kunlun110401.sql b/kunlun110401.sql new file mode 100644 index 0000000..816d293 --- /dev/null +++ b/kunlun110401.sql @@ -0,0 +1,200 @@ +-- -------------------------------------------------------- +-- 涓绘満: 127.0.0.1 +-- 鏈嶅姟鍣ㄧ増鏈�: 8.3.0 - MySQL Community Server - GPL +-- 鏈嶅姟鍣ㄦ搷浣滅郴缁�: Win64 +-- HeidiSQL 鐗堟湰: 12.6.0.6765 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + + +-- 瀵煎嚭 mayi_kunlun 鐨勬暟鎹簱缁撴瀯 +CREATE DATABASE IF NOT EXISTS `mayi_kunlun` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; +USE `mayi_kunlun`; + +-- 瀵煎嚭 琛� 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, + `data` float DEFAULT NULL, + `time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鏁版嵁'; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.data_info 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.devices_management 缁撴瀯 +CREATE TABLE IF NOT EXISTS `devices_management` ( + `id` int NOT NULL, + `devices_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `devices_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `devices_serial_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `devices_status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `longitude` double DEFAULT NULL, + `latitude` double DEFAULT NULL, + `purchasing_time` datetime DEFAULT NULL, + `install_time` datetime DEFAULT NULL, + `manufacturer` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `mark_name` varchar(50) DEFAULT NULL, + `mark_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.devices_management 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.month_info 缁撴瀯 +CREATE TABLE IF NOT EXISTS `month_info` ( + `id` int NOT NULL AUTO_INCREMENT, + `date` char(20) NOT NULL, + `A_output` double NOT NULL, + `B_output` double NOT NULL, + `C_output` double NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='浜ч噺琛�'; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.month_info 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.parsed_logs 缁撴瀯 +CREATE TABLE IF NOT EXISTS `parsed_logs` ( + `id` int NOT NULL AUTO_INCREMENT, + `time_stamp` timestamp 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, + `user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `file_name` varchar(64) NOT NULL, + `problem_line` int NOT NULL, + `function_name` varchar(64) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.parsed_logs 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.production_plan 缁撴瀯 +CREATE TABLE IF NOT EXISTS `production_plan` ( + `id` int NOT NULL AUTO_INCREMENT, + `plan_id` int NOT NULL, + `plan_name` varchar(50) DEFAULT NULL, + `start_date` char(20) DEFAULT NULL, + `closing_date` char(20) DEFAULT NULL, + `production_name` varchar(50) DEFAULT NULL, + `planned_production` double DEFAULT NULL, + `actual_production` double DEFAULT NULL, + `progress` double DEFAULT NULL, + `finish_ontime` int DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.production_plan 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.role_info 缁撴瀯 +CREATE TABLE IF NOT EXISTS `role_info` ( + `id` int NOT NULL AUTO_INCREMENT, + `permission_type` varchar(100) DEFAULT NULL, + `query_history` int DEFAULT '0', + `logger_search` int DEFAULT '0', + `map_mark` int DEFAULT '0', + `dev_manage` int DEFAULT '0', + `product_plan` int DEFAULT '0', + `warning_manage` int DEFAULT '0', + `version_manage` int DEFAULT '0', + `admin` int DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.role_info 鐨勬暟鎹細~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, + `type` varchar(50) DEFAULT NULL, + `time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='闃堝��'; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.threshold_info 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.user_info 缁撴瀯 +CREATE TABLE IF NOT EXISTS `user_info` ( + `id` int NOT NULL AUTO_INCREMENT, + `department` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `password` varchar(32) DEFAULT NULL, + `user_no` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `age` int DEFAULT NULL, + `sex` varchar(10) DEFAULT NULL, + `role_id` int DEFAULT NULL, + `email` varchar(32) DEFAULT NULL, + `telephone` varchar(32) DEFAULT NULL, + `status` int DEFAULT NULL, + `login_time` datetime DEFAULT NULL, + `register_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.user_info 鐨勬暟鎹細~0 rows (澶х害) + +-- 瀵煎嚭 琛� mayi_kunlun.version_file 缁撴瀯 +CREATE TABLE IF NOT EXISTS `version_file` ( + `id` int NOT NULL AUTO_INCREMENT, + `version_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + `filename` char(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + `fliesize` bigint NOT NULL DEFAULT (0), + `s_filepath` varchar(256) NOT NULL, + `c_filepath` varchar(256) NOT NULL, + `uploader` char(64) NOT NULL DEFAULT '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.version_file 鐨勬暟鎹細~3 rows (澶х害) +INSERT INTO `version_file` (`id`, `version_id`, `filename`, `fliesize`, `s_filepath`, `c_filepath`, `uploader`) VALUES + (1, '1.3', '1.jpd', 12555, './versoin', './2', ''), + (2, '1.4', '2.jpd', 1255, './', './2', ''), + (3, '1.5', '3.jpd', 122, './', './2', ''); + +-- 瀵煎嚭 琛� mayi_kunlun.version_info 缁撴瀯 +CREATE TABLE IF NOT EXISTS `version_info` ( + `id` int NOT NULL AUTO_INCREMENT, + `version_id` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + `version_id_old` char(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + `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=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +-- 姝ｅ湪瀵煎嚭琛� 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` ( + `id` int NOT NULL AUTO_INCREMENT, + `device_id` int NOT NULL, + `des` varchar(50) NOT NULL, + `time` datetime NOT NULL, + `warningdata` float NOT NULL, + `type` varchar(50) NOT NULL, + `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 (澶х害) + +/*!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) */; diff --git "a/\350\241\250.docx" "b/\350\241\250.docx" index 24dd1ba..50f24ec 100644 --- "a/\350\241\250.docx" +++ "b/\350\241\250.docx" Binary files differ -- Gitblit v1.8.0