From 6bb65ed48cc82e8f7920a04c96f8bae939ac9beb Mon Sep 17 00:00:00 2001 From: xiaorongnie Date: Mon, 9 Feb 2026 17:20:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(organize=5Fdevice=5Fparam):=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=8F=82=E6=95=B0=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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mysql8/initdb/01-maintain-init-table.sql b/mysql8/initdb/01-maintain-init-table.sql index f9dcd11..ddb595f 100644 --- a/mysql8/initdb/01-maintain-init-table.sql +++ b/mysql8/initdb/01-maintain-init-table.sql @@ -1997,6 +1997,28 @@ CREATE TABLE `organize_device_compose` ( INDEX `idx_vehicle`(`organize_id` ASC, `vehicle_id` ASC) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车上安装设备表' ROW_FORMAT = DYNAMIC; +-- ---------------------------- +-- Table structure for organize_device_param +-- ---------------------------- +DROP TABLE IF EXISTS `organize_device_param`; +CREATE TABLE `organize_device_param` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '车辆上安装的设备列表', + `organize_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '组织ID', + `vehicle_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '车辆ID', + `imei` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '设备唯一码, 过渡32, 实际很多表都还是16', + `device_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '设备的唯一标识', + `param_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '参数类别(speed_limit / overspeed_duration)等', + `expect_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '平台期望值', + `actual_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备读取值', + `last_read_time` datetime NULL DEFAULT NULL COMMENT '最后读取时间', + `last_set_time` datetime NULL DEFAULT NULL COMMENT '最后下发时间', + `status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'UNKNOWN' COMMENT 'CONSISTENT / DIFF / UNKNOWN', + `created_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间戳', + `updated_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `uk_param_key`(`organize_id` ASC, `vehicle_id` ASC, `imei` ASC, `param_code` ASC) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备参数表' ROW_FORMAT = DYNAMIC; + -- ---------------------------- -- Table structure for organize_device_product -- ---------------------------- From 70cfcb6cb53603df1468a5528b7333ff2535aca6 Mon Sep 17 00:00:00 2001 From: xiaorongnie Date: Mon, 9 Feb 2026 17:24:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=B020260209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.en.env | 8 ++++---- default.env | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/default.en.env b/default.en.env index 3b123c6..72755ab 100644 --- a/default.en.env +++ b/default.en.env @@ -169,10 +169,10 @@ BUS_GATEWAY_808_2019_VERSION=25.11.14 # bus active safety version BUS_GATEWAY_JSATL12_VERSION=23.1.21 -# track, version check date: 2026-1-28 +# track, version check date: 2026-2-9 # track frontend -TRACK_WEB_VERSION=1.66.1 +TRACK_WEB_VERSION=1.67.0 # track backend -TRACK_MAINTAIN_VERSION=1.59.1 +TRACK_MAINTAIN_VERSION=1.60.0 # track gateway -TRACK_JTT808_VERSION=1.26.1 +TRACK_JTT808_VERSION=1.26.2 diff --git a/default.env b/default.env index f51d09d..7b5ed48 100644 --- a/default.env +++ b/default.env @@ -168,10 +168,10 @@ BUS_GATEWAY_808_2019_VERSION=25.11.14 # 公交主动安全版本号 BUS_GATEWAY_JSATL12_VERSION=23.1.21 -# track, 版本号核对日期: 2026-1-28 +# track, 版本号核对日期: 2026-2-9 # track前端 -TRACK_WEB_VERSION=1.66.1 +TRACK_WEB_VERSION=1.67.0 # track后端 -TRACK_MAINTAIN_VERSION=1.59.1 +TRACK_MAINTAIN_VERSION=1.60.0 # track网关 -TRACK_JTT808_VERSION=1.26.1 +TRACK_JTT808_VERSION=1.26.2 From a58f2fe30071943f15973d64695cdf460e9a5d52 Mon Sep 17 00:00:00 2001 From: xiaorongnie Date: Mon, 9 Feb 2026 18:49:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8Map=E6=97=B6=E5=8C=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.en.env | 2 +- default.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.en.env b/default.en.env index 72755ab..1a3d761 100644 --- a/default.en.env +++ b/default.en.env @@ -173,6 +173,6 @@ BUS_GATEWAY_JSATL12_VERSION=23.1.21 # track frontend TRACK_WEB_VERSION=1.67.0 # track backend -TRACK_MAINTAIN_VERSION=1.60.0 +TRACK_MAINTAIN_VERSION=1.60.1 # track gateway TRACK_JTT808_VERSION=1.26.2 diff --git a/default.env b/default.env index 7b5ed48..dd67d21 100644 --- a/default.env +++ b/default.env @@ -172,6 +172,6 @@ BUS_GATEWAY_JSATL12_VERSION=23.1.21 # track前端 TRACK_WEB_VERSION=1.67.0 # track后端 -TRACK_MAINTAIN_VERSION=1.60.0 +TRACK_MAINTAIN_VERSION=1.60.1 # track网关 TRACK_JTT808_VERSION=1.26.2 From f951659180dc73dc63aa3bcc59bbb95114a96fa8 Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Tue, 3 Mar 2026 15:04:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?perf(=E8=AE=BE=E5=A4=87=E8=A1=A8):=20=20?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=BF=81=E7=A7=BB=E5=88=B0OrganizeDeviceTerm?= =?UTF-8?q?inal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql8/initdb/01-maintain-init-table.sql | 30 ------------------------ 1 file changed, 30 deletions(-) diff --git a/mysql8/initdb/01-maintain-init-table.sql b/mysql8/initdb/01-maintain-init-table.sql index ddb595f..96dc1dd 100644 --- a/mysql8/initdb/01-maintain-init-table.sql +++ b/mysql8/initdb/01-maintain-init-table.sql @@ -1945,7 +1945,6 @@ CREATE TABLE `organize_device` ( `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备类型ID', `product_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备类型名称', `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备类别', - `category_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '类别名称', `device_model` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备型号', `time_zone` varchar(6) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '+08:00' COMMENT '设备台账时区', `character_set` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'GBK' COMMENT '字符集GBK或UTF-8', @@ -1960,9 +1959,6 @@ CREATE TABLE `organize_device` ( `last_disconnect_time` datetime NULL DEFAULT NULL COMMENT '最后断开时间', `last_gps_time` datetime NULL DEFAULT NULL COMMENT '最后GPS时间', `last_gps_mileage` decimal(11, 3) NULL DEFAULT NULL COMMENT '最后GPS时间', - `register_producer_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '制造商ID', - `register_terminal_model` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端型号', - `register_terminal_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端ID', `creator_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者ID', `created_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间戳', `updated_unix` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', @@ -1971,32 +1967,6 @@ CREATE TABLE `organize_device` ( INDEX `idx_vehicle`(`organize_id` ASC, `vehicle_id` ASC) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车上安装设备表' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Table structure for organize_device_compose --- ---------------------------- -DROP TABLE IF EXISTS `organize_device_compose`; -CREATE TABLE `organize_device_compose` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT '--20250-09-16---废弃, 使用OrganizeDeviceTerminal替代', - `imei` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备唯一码, 过渡32, 实际很多表都还是16', - `device_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '设备的唯一标识', - `organize_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '组织ID', - `vehicle_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '车辆ID', - `register_producer_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端注册-制造商ID', - `register_terminal_model` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端注册-终端型号', - `register_terminal_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端注册-终端ID', - `first_connect_time` datetime NULL DEFAULT NULL COMMENT '第一次连接时间', - `last_connect_time` datetime NULL DEFAULT NULL COMMENT '最后连接时间', - `last_connect_protocol` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后连接使用的协议', - `last_disconnect_time` datetime NULL DEFAULT NULL COMMENT '最后断开时间', - `last_version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '读取出来的版本号', - `last_version_time` datetime 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 '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uk_device_key`(`imei` ASC, `device_key` ASC) USING BTREE, - INDEX `idx_vehicle`(`organize_id` ASC, `vehicle_id` ASC) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车上安装设备表' ROW_FORMAT = DYNAMIC; - -- ---------------------------- -- Table structure for organize_device_param -- ---------------------------- From 0ea3daa39e2ada6e85c216e876fb3910c53778b6 Mon Sep 17 00:00:00 2001 From: niexiaorong Date: Tue, 3 Mar 2026 15:17:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=B02026-3-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.en.env | 8 ++++---- default.env | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/default.en.env b/default.en.env index 1a3d761..e5508a8 100644 --- a/default.en.env +++ b/default.en.env @@ -169,10 +169,10 @@ BUS_GATEWAY_808_2019_VERSION=25.11.14 # bus active safety version BUS_GATEWAY_JSATL12_VERSION=23.1.21 -# track, version check date: 2026-2-9 +# track, version check date: 2026-3-3 # track frontend -TRACK_WEB_VERSION=1.67.0 +TRACK_WEB_VERSION=1.68.0 # track backend -TRACK_MAINTAIN_VERSION=1.60.1 +TRACK_MAINTAIN_VERSION=1.61.0 # track gateway -TRACK_JTT808_VERSION=1.26.2 +TRACK_JTT808_VERSION=1.26.3 diff --git a/default.env b/default.env index dd67d21..8885116 100644 --- a/default.env +++ b/default.env @@ -168,10 +168,10 @@ BUS_GATEWAY_808_2019_VERSION=25.11.14 # 公交主动安全版本号 BUS_GATEWAY_JSATL12_VERSION=23.1.21 -# track, 版本号核对日期: 2026-2-9 +# track, 版本号核对日期: 2026-3-3 # track前端 -TRACK_WEB_VERSION=1.67.0 +TRACK_WEB_VERSION=1.68.0 # track后端 -TRACK_MAINTAIN_VERSION=1.60.1 +TRACK_MAINTAIN_VERSION=1.61.0 # track网关 -TRACK_JTT808_VERSION=1.26.2 +TRACK_JTT808_VERSION=1.26.3