From 9813cff0227d16902f8785cdeac650a38e0c9a24 Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期一, 18 十一月 2024 15:31:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/烛龙AI_1111_07.17

---
 Client/朱航/log/~$航1116..doc              |    0 
 Server/龚启祥/log/日志模板_龚启祥_1115.doc        |    0 
 数据库表.docx                               |    0 
 Client/马渝杭/log/20241116烛龙AII日报.doc      |    0 
 Client/马丽萍/log/日志_马丽萍_11.18.doc         |    0 
 Client/马渝杭/document/打卡识别管理功能需求.docx     |    0 
 Client/朱航/log/朱航1116..doc               |    0 
 Server/冀浩昶/log/日志_冀浩昶_1118.doc          |    0 
 Client/刘子航/log/日志_刘子航_1116.doc          |    0 
 zhulongAI.sql                           |  155 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Server/姜可庚/log/姜可庚_1118.doc             |    0 
 Client/王琨元/log/日志模板_王琨元_1116.doc        |    0 
 Client/马渝杭/log/20241114烛龙AII日报 - 副本.doc |    0 
 13 files changed, 155 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_1116.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_1116.doc"
new file mode 100644
index 0000000..236d833
--- /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_1116.doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/~$\346\234\261\350\210\2521114.doc" "b/Client/\346\234\261\350\210\252/log/~$\350\210\2521116..doc"
similarity index 100%
rename from "Client/\346\234\261\350\210\252/log/~$\346\234\261\350\210\2521114.doc"
rename to "Client/\346\234\261\350\210\252/log/~$\350\210\2521116..doc"
Binary files differ
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521116..doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521116..doc"
new file mode 100644
index 0000000..ec678eb
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521116..doc"
Binary files differ
diff --git "a/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1116.doc" "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1116.doc"
new file mode 100644
index 0000000..b32104b
--- /dev/null
+++ "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1116.doc"
Binary files differ
diff --git "a/Client/\351\251\254\344\270\275\350\220\215/log/\346\227\245\345\277\227_\351\251\254\344\270\275\350\220\215_11.18.doc" "b/Client/\351\251\254\344\270\275\350\220\215/log/\346\227\245\345\277\227_\351\251\254\344\270\275\350\220\215_11.18.doc"
new file mode 100644
index 0000000..3f3d4f4
--- /dev/null
+++ "b/Client/\351\251\254\344\270\275\350\220\215/log/\346\227\245\345\277\227_\351\251\254\344\270\275\350\220\215_11.18.doc"
Binary files differ
diff --git "a/Client/\351\251\254\346\270\235\346\235\255/document/\346\211\223\345\215\241\350\257\206\345\210\253\347\256\241\347\220\206\345\212\237\350\203\275\351\234\200\346\261\202.docx" "b/Client/\351\251\254\346\270\235\346\235\255/document/\346\211\223\345\215\241\350\257\206\345\210\253\347\256\241\347\220\206\345\212\237\350\203\275\351\234\200\346\261\202.docx"
index daadb26..ee02b95 100644
--- "a/Client/\351\251\254\346\270\235\346\235\255/document/\346\211\223\345\215\241\350\257\206\345\210\253\347\256\241\347\220\206\345\212\237\350\203\275\351\234\200\346\261\202.docx"
+++ "b/Client/\351\251\254\346\270\235\346\235\255/document/\346\211\223\345\215\241\350\257\206\345\210\253\347\256\241\347\220\206\345\212\237\350\203\275\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245 - \345\211\257\346\234\254.doc" "b/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245 - \345\211\257\346\234\254.doc"
new file mode 100644
index 0000000..de8101d
--- /dev/null
+++ "b/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245 - \345\211\257\346\234\254.doc"
Binary files differ
diff --git "a/Client/\351\251\254\346\270\235\346\235\255/log/20241116\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" "b/Client/\351\251\254\346\270\235\346\235\255/log/20241116\347\203\233\351\276\231AII\346\227\245\346\212\245.doc"
new file mode 100644
index 0000000..8627236
--- /dev/null
+++ "b/Client/\351\251\254\346\270\235\346\235\255/log/20241116\347\203\233\351\276\231AII\346\227\245\346\212\245.doc"
Binary files differ
diff --git "a/Server/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1118.doc" "b/Server/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1118.doc"
new file mode 100644
index 0000000..0b6002c
--- /dev/null
+++ "b/Server/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1118.doc"
Binary files differ
diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1118.doc" "b/Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1118.doc"
new file mode 100644
index 0000000..6de2767
--- /dev/null
+++ "b/Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1118.doc"
Binary files differ
diff --git "a/Server/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1115.doc" "b/Server/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1115.doc"
new file mode 100644
index 0000000..afb142a
--- /dev/null
+++ "b/Server/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1115.doc"
Binary files differ
diff --git a/zhulongAI.sql b/zhulongAI.sql
new file mode 100644
index 0000000..f077022
--- /dev/null
+++ b/zhulongAI.sql
@@ -0,0 +1,155 @@
+-- --------------------------------------------------------
+-- 涓绘満:                           127.0.0.1
+-- 鏈嶅姟鍣ㄧ増鏈�:                        8.0.39 - 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 */;
+
+
+-- 瀵煎嚭 zhulongai 鐨勬暟鎹簱缁撴瀯
+CREATE DATABASE IF NOT EXISTS `zhulongai` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+USE `zhulongai`;
+
+-- 瀵煎嚭  琛� zhulongai.attendance_record 缁撴瀯
+CREATE TABLE IF NOT EXISTS `attendance_record` (
+  `record_id` int NOT NULL AUTO_INCREMENT COMMENT '鎵撳崱璁板綍鐨勫敮涓�鏍囪瘑',
+  `user_id` int DEFAULT NULL COMMENT '鍏宠仈鐨勭敤鎴稩D',
+  `timestamp` datetime NOT NULL COMMENT '鎵撳崱鏃堕棿',
+  `status` varchar(20) DEFAULT NULL COMMENT '鎵撳崱鐘舵�侊紙鎴愬姛/澶辫触锛�',
+  PRIMARY KEY (`record_id`),
+  KEY `FK_attendance_record_user_info` (`user_id`),
+  CONSTRAINT `FK_attendance_record_user_info` FOREIGN KEY (`user_id`) REFERENCES `user_info` (`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鐢ㄦ埛鎵撳崱璁板綍琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.attendance_record 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.camera_mark_manage 缁撴瀯
+CREATE TABLE IF NOT EXISTS `camera_mark_manage` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `camera_name` varchar(50) NOT NULL COMMENT '鎽勫儚澶村悕绉�',
+  `area` varchar(128) NOT NULL COMMENT '鍦板尯',
+  `status` varchar(50) NOT NULL COMMENT '鐘舵��',
+  `ip` varchar(50) NOT NULL COMMENT 'ip',
+  `mark_time` varchar(50) NOT NULL COMMENT '鏍囨敞鏃堕棿',
+  `buy_time` varchar(50) NOT NULL COMMENT '璐拱鏃堕棿',
+  `install_time` varchar(50) NOT NULL COMMENT '瀹夎鏃堕棿',
+  `camera_number` varchar(50) NOT NULL COMMENT '鎽勫儚澶寸紪鐮�',
+  `camera_type` varchar(50) NOT NULL COMMENT '鎽勫儚澶寸被鍨�',
+  `longitude` double NOT NULL COMMENT '缁忓害',
+  `latitude` double NOT NULL COMMENT '绾害',
+  `belong_to` varchar(50) NOT NULL COMMENT '鎵�灞炵粍缁�/閮ㄩ棬',
+  `factory` varchar(128) NOT NULL COMMENT '鍘傚',
+  `notes` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '澶囨敞',
+  `live_url` varchar(128) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鎽勫儚澶寸鐞嗚〃';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.camera_mark_manage 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.camera_url 缁撴瀯
+CREATE TABLE IF NOT EXISTS `camera_url` (
+  `id` int DEFAULT NULL,
+  `camera_name` varchar(128) DEFAULT NULL,
+  `file_name` varchar(128) DEFAULT NULL,
+  `local_url` varchar(128) DEFAULT NULL,
+  KEY `id` (`id`),
+  CONSTRAINT `FK_camera_url_camera_mark_manage` FOREIGN KEY (`id`) REFERENCES `camera_mark_manage` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.camera_url 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.parsed_logs 缁撴瀯
+CREATE TABLE IF NOT EXISTS `parsed_logs` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '涓婚敭锛岃嚜澧�',
+  `time_stamp` varchar(64) DEFAULT NULL COMMENT '鏃堕棿鎴�',
+  `camera_id` varchar(64) NOT NULL COMMENT '鎽勫儚澶碔D',
+  `level` varchar(64) DEFAULT NULL COMMENT '鏃ュ織绾у埆',
+  `module` varchar(64) DEFAULT NULL COMMENT '鍔熻兘妯″潡',
+  `content` varchar(256) DEFAULT NULL COMMENT '鏃ュ織鍐呭',
+  `user_id` varchar(32) DEFAULT NULL COMMENT '鐢ㄦ埛ID',
+  `file_name` varchar(64) DEFAULT NULL COMMENT '闂鏂囦欢鍚�',
+  `problem_line` int DEFAULT NULL COMMENT '闂琛屾暟',
+  `function_name` varchar(32) DEFAULT NULL COMMENT '闂鍑芥暟鍚�',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鏃ュ織琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.parsed_logs 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.role_info 缁撴瀯
+CREATE TABLE IF NOT EXISTS `role_info` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '瑙掕壊琛ㄤ富閿嚜澧瀒d',
+  `permission_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '瑙掕壊绫诲瀷',
+  `query_history` int DEFAULT NULL COMMENT '鍘嗗彶鏌ヨ鍔熻兘',
+  `logger_search` int DEFAULT NULL COMMENT '鏃ュ織鏌ヨ鍔熻兘',
+  `camera_mark` int DEFAULT NULL COMMENT '鎽勫儚澶存爣娉�',
+  `dev_manage` int DEFAULT NULL COMMENT '鎽勫儚澶磋澶囩鐞�(0,1,2)鍒嗗埆瀵瑰簲鏃犳潈闄愶紝鍙煡鐪嬶紝鍙煡鐪嬩慨鏀�',
+  `image_input` int DEFAULT NULL COMMENT '鍥惧儚褰曞叆绠$悊',
+  `version_manage` int DEFAULT NULL COMMENT '鐗堟湰绠$悊',
+  `admin` int DEFAULT NULL COMMENT '瓒呯骇绠$悊鍛�',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑙掕壊鏉冮檺琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.role_info 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.user_info 缁撴瀯
+CREATE TABLE IF NOT EXISTS `user_info` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'id(鑷)',
+  `department` varchar(50) DEFAULT NULL COMMENT '鍛樺伐鎵�鍦ㄩ儴闂�',
+  `user_name` varchar(32) DEFAULT NULL COMMENT '鐢ㄦ埛鍚�(鍞竴閿�)',
+  `password` varchar(255) DEFAULT NULL COMMENT '鐢ㄦ埛瀵嗙爜',
+  `user_no` varchar(10) DEFAULT NULL COMMENT '宸ュ彿锛堣嚜鍔ㄧ敓鎴愶級',
+  `age` int NOT NULL COMMENT '鍛樺伐骞撮緞',
+  `sex` varchar(10) NOT NULL DEFAULT '' COMMENT '鍛樺伐鎬у埆',
+  `role_id` int DEFAULT NULL COMMENT '瑙掕壊id锛屽閿叧鑱旇鑹茶〃鐨勪富閿�',
+  `email` varchar(32) DEFAULT NULL COMMENT '鐢靛瓙閭',
+  `telephone` varchar(32) NOT NULL DEFAULT '' COMMENT '鐢佃瘽鍙风爜',
+  `status` int DEFAULT NULL COMMENT '鐢ㄦ埛鐘舵�侊紙1鍦ㄨ亴銆�0绂昏亴锛�',
+  `login_time` datetime DEFAULT NULL COMMENT '鐧诲綍鏃堕棿',
+  `register_time` datetime DEFAULT NULL COMMENT '娉ㄥ唽鏃堕棿',
+  `dir` varchar(50) DEFAULT NULL COMMENT '鐓х墖鎵�鍦ㄧ洰褰�',
+  PRIMARY KEY (`id`),
+  KEY `role_id` (`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鐢ㄦ埛淇℃伅琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.user_info 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.version_file 缁撴瀯
+CREATE TABLE IF NOT EXISTS `version_file` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `version_id` char(64) DEFAULT NULL COMMENT '鐗堟湰鍙�',
+  `filename` char(128) DEFAULT NULL COMMENT '鏂囦欢鍚�',
+  `fliesize` bigint DEFAULT NULL COMMENT '鏂囦欢澶у皬',
+  `s_filepath` varchar(50) DEFAULT NULL COMMENT '鏈嶅姟绔矾寰�',
+  `c_filepath` varchar(50) DEFAULT NULL COMMENT '瀹㈡埛绔矾寰�',
+  `uploader` char(64) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鐗堟湰鏇存柊琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.version_file 鐨勬暟鎹細~0 rows (澶х害)
+
+-- 瀵煎嚭  琛� zhulongai.version_info 缁撴瀯
+CREATE TABLE IF NOT EXISTS `version_info` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `version_id` char(64) DEFAULT NULL COMMENT '鐗堟湰鍙�',
+  `version_id_old` char(64) DEFAULT NULL COMMENT '鏃х増鐗堟湰鍙�',
+  `version_description` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '鐗堟湰鎻忚堪',
+  `version_creatime` datetime DEFAULT NULL COMMENT '鐗堟湰鍒涘缓',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='鐗堟湰鏇存柊琛�';
+
+-- 姝e湪瀵煎嚭琛�  zhulongai.version_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/\346\225\260\346\215\256\345\272\223\350\241\250.docx" "b/\346\225\260\346\215\256\345\272\223\350\241\250.docx"
index 2c57a1b..0d99bb5 100644
--- "a/\346\225\260\346\215\256\345\272\223\350\241\250.docx"
+++ "b/\346\225\260\346\215\256\345\272\223\350\241\250.docx"
Binary files differ

--
Gitblit v1.8.0