Skip to content

feat(新版本): 新增版本20260303 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiaorongnie wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat(新版本): 新增版本20260303 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bb65ed
feat(organize_device_param): 新增设备参数表
xiaorongnie Feb 9, 2026
70cfcb6
更新版本到20260209
xiaorongnie Feb 9, 2026
a58f2fe
修复里程报表Map时区问题
xiaorongnie Feb 9, 2026
f951659
perf(设备表): 已经迁移到OrganizeDeviceTerminal
xiaorongnie Mar 3, 2026
0ea3daa
版本更新到2026-3-3
xiaorongnie Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions default.en.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-3-3
# track frontend
TRACK_WEB_VERSION=1.66.1
TRACK_WEB_VERSION=1.68.0
# track backend
TRACK_MAINTAIN_VERSION=1.59.1
TRACK_MAINTAIN_VERSION=1.61.0
# track gateway
TRACK_JTT808_VERSION=1.26.1
TRACK_JTT808_VERSION=1.26.3
8 changes: 4 additions & 4 deletions default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-3-3
# track前端
TRACK_WEB_VERSION=1.66.1
TRACK_WEB_VERSION=1.68.0
# track后端
TRACK_MAINTAIN_VERSION=1.59.1
TRACK_MAINTAIN_VERSION=1.61.0
# track网关
TRACK_JTT808_VERSION=1.26.1
TRACK_JTT808_VERSION=1.26.3
40 changes: 16 additions & 24 deletions mysql8/initdb/01-maintain-init-table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 '修改时间',
Expand All @@ -1972,30 +1968,26 @@ CREATE TABLE `organize_device` (
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车上安装设备表' ROW_FORMAT = DYNAMIC;

-- ----------------------------
-- Table structure for organize_device_compose
-- Table structure for organize_device_param
-- ----------------------------
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 '最后读取版本时间',
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_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;
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
Expand Down