From fc4b0d5f32c3d8942410666625204b68552d767c Mon Sep 17 00:00:00 2001 From: wangky <m1561510467@163.com> Date: 星期一, 18 十一月 2024 15:30:44 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/烛龙AI_1111_07.17 --- Client/朱航/log/~$航1116..doc | 0 Client/朱航/log/朱航1116..doc | 0 Server/冀浩昶/log/日志_冀浩昶_1118.doc | 0 Server/龚启祥/log/日志模板_龚启祥_1115.doc | 0 Client/刘子航/log/日志_刘子航_1116.doc | 0 zhulongAI.sql | 16 ++++++++++++++-- Server/姜可庚/log/姜可庚_1118.doc | 0 数据库表.docx | 0 Client/马渝杭/log/20241116烛龙AII日报.doc | 0 Client/马渝杭/log/20241114烛龙AII日报 - 副本.doc | 0 10 files changed, 14 insertions(+), 2 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/\351\251\254\346\270\235\346\235\255/log/20241115\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/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245 - \345\211\257\346\234\254.doc" similarity index 100% rename from "Client/\351\251\254\346\270\235\346\235\255/log/20241115\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" rename to "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 index 5582f33..f077022 100644 --- a/zhulongAI.sql +++ b/zhulongAI.sql @@ -40,7 +40,6 @@ `status` varchar(50) NOT NULL COMMENT '鐘舵��', `ip` varchar(50) NOT NULL COMMENT 'ip', `mark_time` varchar(50) NOT NULL COMMENT '鏍囨敞鏃堕棿', - `mark_status` 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 '鎽勫儚澶寸紪鐮�', @@ -48,13 +47,26 @@ `longitude` double NOT NULL COMMENT '缁忓害', `latitude` double NOT NULL COMMENT '绾害', `belong_to` varchar(50) NOT NULL COMMENT '鎵�灞炵粍缁�/閮ㄩ棬', - `url` varchar(128) 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='鎽勫儚澶寸鐞嗚〃'; -- 姝ｅ湪瀵煎嚭琛� 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; + +-- 姝ｅ湪瀵煎嚭琛� zhulongai.camera_url 鐨勬暟鎹細~0 rows (澶х害) + -- 瀵煎嚭 琛� zhulongai.parsed_logs 缁撴瀯 CREATE TABLE IF NOT EXISTS `parsed_logs` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '涓婚敭锛岃嚜澧�', 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