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

---
 zhulongAI.sql |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

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='鎽勫儚澶寸鐞嗚〃';
 
 -- 姝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 '涓婚敭锛岃嚜澧�',

--
Gitblit v1.8.0