Merge branch 'master' into dev/1078-newUI

# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
648540858
2025-05-10 08:59:45 +08:00
378 changed files with 48292 additions and 475 deletions

View File

@@ -365,7 +365,7 @@ create table IF NOT EXISTS wvp_cloud_record
file_path character varying(500),
collect bool default false,
file_size bigint,
time_len bigint
time_len double precision
);
drop table IF EXISTS wvp_user;

View File

@@ -159,11 +159,12 @@ create table IF NOT EXISTS wvp_device_channel
gps_speed double precision,
gps_altitude double precision,
gps_direction double precision,
index (data_type),
index (data_device_id),
constraint uk_wvp_unique_channel unique (gb_device_id)
);
CREATE INDEX idx_data_type ON wvp_device_channel (data_type);
CREATE INDEX idx_data_device_id ON wvp_device_channel (data_device_id);
drop table IF EXISTS wvp_media_server;
create table IF NOT EXISTS wvp_media_server
(
@@ -365,7 +366,7 @@ create table IF NOT EXISTS wvp_cloud_record
file_path character varying(500),
collect bool default false,
file_size int8,
time_len int8
time_len double precision
);
drop table IF EXISTS wvp_user;

View File

@@ -426,3 +426,7 @@ call wvp_20250111();
DROP PROCEDURE wvp_20250111;
DELIMITER ;
/**
* 20250414
*/
alter table wvp_cloud_record modify time_len double precision;

View File

@@ -267,6 +267,11 @@ call wvp_20250319();
DROP PROCEDURE wvp_20250319;
DELIMITER ;
/*
* 20250319
*/
update wvp_record_plan_item set start = start * 30, stop = (stop + 1) * 30
/*
* 20250402
*/
@@ -289,5 +294,10 @@ call wvp_20250402();
DROP PROCEDURE wvp_20250402;
DELIMITER ;
/**
* 20250414
*/
alter table wvp_cloud_record modify time_len double precision;

View File

@@ -137,11 +137,12 @@ create table IF NOT EXISTS wvp_device_channel
gps_speed double precision,
gps_altitude double precision,
gps_direction double precision,
index (data_type),
index (data_device_id),
constraint uk_wvp_unique_channel unique (gb_device_id)
);
create index if not exists data_type on wvp_device_channel (data_type);
create index if not exists data_device_id on wvp_device_channel (data_device_id);
create table IF NOT EXISTS wvp_device_mobile_position
(
id serial primary key,
@@ -387,3 +388,7 @@ alter table wvp_cloud_record alter folder type varchar(500);
alter table wvp_cloud_record alter file_path type varchar(500);
update wvp_cloud_record set server_id = '你的服务ID';
/**
* 20250414
*/
alter table wvp_cloud_record modify time_len double precision;

View File

@@ -102,10 +102,18 @@ alter table wvp_device_channel add column if not exists gps_speed double precisi
alter table wvp_device_channel add column if not exists gps_altitude double precision;
alter table wvp_device_channel add column if not exists gps_direction double precision;
/*
* 20250319
*/
update wvp_record_plan_item set start = start * 30, stop = (stop + 1) * 30
/*
* 20250402
*/
create index if not exists data_type on wvp_device_channel (data_type);
create index if not exists data_device_id on wvp_device_channel (data_device_id);
/**
* 20250414
*/
alter table wvp_cloud_record modify time_len double precision;