From caf56217dc2bf898b63b0e1f31a7098202c32825 Mon Sep 17 00:00:00 2001 From: wlzboy <66905212@qq.com> Date: 星期六, 15 十一月 2025 16:50:17 +0800 Subject: [PATCH] Merge branch 'feature_gps' --- sql/vehicle_mileage_stats.sql | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/sql/vehicle_mileage_stats.sql b/sql/vehicle_mileage_stats.sql index b059dec..25d9667 100644 --- a/sql/vehicle_mileage_stats.sql +++ b/sql/vehicle_mileage_stats.sql @@ -1,37 +1,40 @@ -- 杞﹁締閲岀▼缁熻琛� -DROP TABLE IF EXISTS `vehicle_mileage_stats`; -CREATE TABLE `vehicle_mileage_stats` ( +CREATE TABLE `tb_vehicle_mileage_stats` ( `stats_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '缁熻ID', `vehicle_id` bigint(20) NOT NULL COMMENT '杞﹁締ID', - `stats_date` date NOT NULL COMMENT '缁熻鏃ユ湡', - `total_mileage` decimal(10,2) DEFAULT '0.00' COMMENT '鎬婚噷绋�(鍏噷)', - `task_mileage` decimal(10,2) DEFAULT '0.00' COMMENT '浠诲姟閲岀▼(鍏噷)', - `non_task_mileage` decimal(10,2) DEFAULT '0.00' COMMENT '闈炰换鍔￠噷绋�(鍏噷)', - `task_mileage_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '浠诲姟閲岀▼鍗犳瘮(%)', - `gps_count` int(11) DEFAULT '0' COMMENT 'GPS鐐规暟', + `vehicle_no` varchar(20) DEFAULT NULL COMMENT '杞︾墝鍙�', + `stat_date` date NOT NULL COMMENT '缁熻鏃ユ湡', + `total_mileage` decimal(10,2) DEFAULT 0.00 COMMENT '鎬婚噷绋�(鍏噷)', + `task_mileage` decimal(10,2) DEFAULT 0.00 COMMENT '浠诲姟鏃舵閲岀▼(鍏噷)', + `non_task_mileage` decimal(10,2) DEFAULT 0.00 COMMENT '闈炰换鍔℃椂娈甸噷绋�(鍏噷)', + `task_ratio` decimal(5,4) DEFAULT 0.0000 COMMENT '浠诲姟閲岀▼鍗犳瘮(0-1)', + `gps_point_count` int(11) DEFAULT 0 COMMENT 'GPS鐐规暟閲�', + `task_count` int(11) DEFAULT 0 COMMENT '浠诲姟鏁伴噺', `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿', `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿', PRIMARY KEY (`stats_id`), - UNIQUE KEY `uk_vehicle_date` (`vehicle_id`,`stats_date`), - KEY `idx_stats_date` (`stats_date`), - KEY `idx_vehicle_id` (`vehicle_id`) + UNIQUE KEY `uk_vehicle_date` (`vehicle_id`, `stat_date`), + KEY `idx_vehicle_id` (`vehicle_id`), + KEY `idx_stat_date` (`stat_date`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='杞﹁締閲岀▼缁熻琛�'; --- 杞﹁締閲岀▼缁熻鏄庣粏琛� -DROP TABLE IF EXISTS `vehicle_mileage_stats_detail`; -CREATE TABLE `vehicle_mileage_stats_detail` ( +-- 杞﹁締閲岀▼缁熻鏄庣粏琛紙鍙�夛紝鐢ㄤ簬璋冭瘯鍜岃拷婧級 +CREATE TABLE `tb_vehicle_mileage_detail` ( `detail_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鏄庣粏ID', `stats_id` bigint(20) NOT NULL COMMENT '缁熻ID', `vehicle_id` bigint(20) NOT NULL COMMENT '杞﹁締ID', - `task_id` bigint(20) DEFAULT NULL COMMENT '浠诲姟ID(浠诲姟鏃舵)', - `start_time` datetime NOT NULL COMMENT '寮�濮嬫椂闂�', - `end_time` datetime NOT NULL COMMENT '缁撴潫鏃堕棿', - `mileage` decimal(10,2) DEFAULT '0.00' COMMENT '閲岀▼(鍏噷)', - `is_task_period` char(1) DEFAULT '0' COMMENT '鏄惁浠诲姟鏃舵(0鍚� 1鏄�)', - `gps_count` int(11) DEFAULT '0' COMMENT 'GPS鐐规暟', + `segment_start_time` datetime NOT NULL COMMENT '娈佃捣濮嬫椂闂�', + `segment_end_time` datetime NOT NULL COMMENT '娈电粨鏉熸椂闂�', + `start_longitude` decimal(10,7) DEFAULT NULL COMMENT '璧风偣缁忓害', + `start_latitude` decimal(10,7) DEFAULT NULL COMMENT '璧风偣绾害', + `end_longitude` decimal(10,7) DEFAULT NULL COMMENT '缁堢偣缁忓害', + `end_latitude` decimal(10,7) DEFAULT NULL COMMENT '缁堢偣绾害', + `segment_distance` decimal(10,3) DEFAULT 0.000 COMMENT '娈佃窛绂�(鍏噷)', + `task_distance` decimal(10,3) DEFAULT 0.000 COMMENT '浠诲姟鍐呰窛绂�(鍏噷)', + `non_task_distance` decimal(10,3) DEFAULT 0.000 COMMENT '浠诲姟澶栬窛绂�(鍏噷)', + `is_in_task` tinyint(1) DEFAULT 0 COMMENT '鏄惁瀹屽叏鍦ㄤ换鍔℃椂娈靛唴(0-鍚�,1-鏄�,2-閮ㄥ垎)', `create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿', PRIMARY KEY (`detail_id`), KEY `idx_stats_id` (`stats_id`), - KEY `idx_vehicle_id` (`vehicle_id`), - KEY `idx_task_id` (`task_id`) + KEY `idx_vehicle_id` (`vehicle_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='杞﹁締閲岀▼缁熻鏄庣粏琛�'; -- Gitblit v1.9.1