From 6e44fa744e163a41cb48e22375c13bad388ce645 Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Wed, 31 Dec 2025 16:18:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(=E6=96=B0=E7=89=88=E6=9C=AC):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0BUS=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.default | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.default b/.env.default index 2110d64..d82a48f 100644 --- a/.env.default +++ b/.env.default @@ -161,11 +161,11 @@ MAIL_PASSWORD='' ## ================================ 版本号, 设为latest则使用最新版 ================================ -# bus, 版本号核对日期: 2025-12-23 +# bus, 版本号核对日期: 2025-12-31 # bus前端 -BUS_WEB_VERSION=5.32.0 +BUS_WEB_VERSION=5.33.0 # bus的后端 -BUS_GATEWAY_VERSION=1.24.0 +BUS_GATEWAY_VERSION=1.25.0 # 公交808-2019版本号 BUS_GATEWAY_808_2019_VERSION=25.8.25 # 公交主动安全版本号 From 997dbfbcb4f0781f977261808d30224ef74b517c Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Wed, 31 Dec 2025 17:25:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC):?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0track=E5=B9=B3=E5=8F=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.default | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.default b/.env.default index d82a48f..a919b4d 100644 --- a/.env.default +++ b/.env.default @@ -171,10 +171,10 @@ BUS_GATEWAY_808_2019_VERSION=25.8.25 # 公交主动安全版本号 BUS_GATEWAY_JSATL12_VERSION=23.1.21 -# track, 版本号核对日期: 2025-12-01 +# track, 版本号核对日期: 2025-12-31 # track前端 -TRACK_WEB_VERSION=1.60.1 +TRACK_WEB_VERSION=1.62.0 # track后端 -TRACK_MAINTAIN_VERSION=1.54.0 +TRACK_MAINTAIN_VERSION=1.56.0 # track网关 -TRACK_JTT808_VERSION=1.24.1 +TRACK_JTT808_VERSION=1.26.0 From a1918410f2cb1f6dcfbf52c010e3f5ec97ac040e Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Wed, 31 Dec 2025 17:28:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(=E5=85=AC=E4=BA=A4=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84):=20=E6=96=B0=E5=A2=9E=E5=BD=AD=E5=B7=9E=E5=AE=9A?= =?UTF-8?q?=E5=88=B6=E6=8A=95=E8=AF=89=E5=92=8C=E4=B8=89=E6=A3=80=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql8/initdb/03-cbus-init-table.sql | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/mysql8/initdb/03-cbus-init-table.sql b/mysql8/initdb/03-cbus-init-table.sql index 673db42..82ed307 100644 --- a/mysql8/initdb/03-cbus-init-table.sql +++ b/mysql8/initdb/03-cbus-init-table.sql @@ -3135,10 +3135,10 @@ CREATE TABLE `schedule_complaint` ( `company_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '企业ID', `complaint_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '投诉ID', `complaint_status` tinyint NOT NULL DEFAULT 0 COMMENT '工单状态: 0=录入工单, 10=处理中, 20=处理完成, 100=归档', - `complain_type` int NULL DEFAULT NULL COMMENT '投诉类型: 1=驾驶员行为, 2=调度/运营问题, 3=计费/结算问题, 10=其他', + `complaint_type` int NULL DEFAULT NULL COMMENT '投诉类型: 1=驾驶员行为, 2=调度/运营问题, 3=计费/结算问题, 10=其他', `urgency_level` tinyint NULL DEFAULT NULL COMMENT '紧急程度: 1=低, 2=中, 3=高, 4=紧急', - `complain_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '投诉标题', - `complain_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '投诉内容', + `complaint_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '投诉标题', + `complaint_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '投诉内容', `attachments` json NULL COMMENT '投诉图片列表(JSON数组)', `complainant_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '投诉人姓名', `complainant_phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '投诉人联系方式', @@ -3154,6 +3154,25 @@ CREATE TABLE `schedule_complaint` ( INDEX `idx_complaint_status`(`complaint_status` ASC) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '公交投诉数据表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Table structure for schedule_complaint_progress +-- ---------------------------- +DROP TABLE IF EXISTS `schedule_complaint_progress`; +CREATE TABLE `schedule_complaint_progress` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `company_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '企业ID', + `complaint_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '投诉ID', + `progress_content` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '进度内容', + `attachments` json NULL COMMENT '投诉图片列表(JSON数组)', + `create_user_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '创建人ID', + `create_user_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', + `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_company_id`(`company_id` ASC) USING BTREE, + INDEX `idx_complaint_no`(`complaint_no` ASC) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '公交投诉数据表' ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for schedule_health -- ---------------------------- @@ -3580,6 +3599,7 @@ CREATE TABLE `schedule_three_check` ( `car_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '车辆id', `car_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '车辆自编码', `weather` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '天气', + `route_id` varchar(16) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '线路id', `route_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线路名称', `drive_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '驾驶员', `check_type` int NULL DEFAULT NULL COMMENT '1出车前 2行驶中 3收车后', From 02af8ef8a070646e279224203a270b72844ca25c Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Wed, 31 Dec 2025 17:35:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(track=E6=95=B0=E6=8D=AE=E5=BA=93):=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=A7=86=E9=A2=91=E4=B8=8B=E8=BD=BD=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql8/initdb/01-maintain-init-table.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql8/initdb/01-maintain-init-table.sql b/mysql8/initdb/01-maintain-init-table.sql index a07a1e9..f9dcd11 100644 --- a/mysql8/initdb/01-maintain-init-table.sql +++ b/mysql8/initdb/01-maintain-init-table.sql @@ -621,6 +621,7 @@ CREATE TABLE `jtt808_file_upload` ( `remark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注信息', `serial` int NULL DEFAULT NULL COMMENT '应答流水号', `file_expiration_time` datetime NULL DEFAULT NULL COMMENT '文件保存有效期', + `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名称,主要用于JiMi文件下载', `creator_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求用户', `created_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间戳', `updated_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', From 326c438e5cbe0af5541713b87664f373c8d3a3ee Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Sun, 4 Jan 2026 16:20:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(=E7=BA=BF=E8=B7=AFAPI=E8=A7=86?= =?UTF-8?q?=E5=9B=BE):=20=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=98=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql8/initdb/03-cbus-init-table.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql8/initdb/03-cbus-init-table.sql b/mysql8/initdb/03-cbus-init-table.sql index 82ed307..7abadd3 100644 --- a/mysql8/initdb/03-cbus-init-table.sql +++ b/mysql8/initdb/03-cbus-init-table.sql @@ -4560,8 +4560,7 @@ CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_api_direction` AS s -- View structure for view_api_route -- ---------------------------- DROP VIEW IF EXISTS `view_api_route`; -CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_api_route` AS select `basic_route`.`id` AS `id`,`basic_route`.`company_id` AS `company_id`,`basic_route`.`route_code` AS `route_code`,`basic_route`.`route_id` AS `route_id`,`basic_route`.`route_name` AS `route_name`,`basic_route`.`category` AS `category`,`basic_route`.`create_time` AS `create_time`,`basic_route`.`update_time` AS `update_time` from `basic_route` where (`basic_route`.`is_deleted` = 0); - +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_api_route` AS select `basic_route`.`id` AS `id`,`basic_route`.`company_id` AS `company_id`,`basic_route`.`route_code` AS `route_code`,`basic_route`.`route_id` AS `route_id`,`basic_route`.`route_name` AS `route_name`,`basic_route`.`category` AS `category`,`basic_route`.`fleet_id` AS `fleet_id`,`basic_fleet`.`fleet_name` AS `fleet_name`,`basic_route`.`create_time` AS `create_time`,`basic_route`.`update_time` AS `update_time` from (`basic_route` left join `basic_fleet` on(((`basic_route`.`company_id` = `basic_fleet`.`company_id`) and (`basic_route`.`fleet_id` = `basic_fleet`.`fleet_id`)))) where (`basic_route`.`is_deleted` = 0); -- ---------------------------- -- View structure for view_api_station -- ----------------------------