code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(视频设备): 报错修改

Browse Source
This commit is contained in:
gx_ma
2025-04-24 17:14:00 +08:00
parent 461ab2a37e
commit 32cc5e794e
6 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
springboot/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java
View File

@@ -33,6 +33,7 @@ public class GenTable extends BaseEntity
/**
* 数据源名称
*/
@ApiModelProperty("数据源名称")
@NotBlank(message = "数据源名称不能为空")
private String dataName;

8
springboot/fastbee-server/sip-server/src/main/resources/mapper/SipConfigMapper.xml
View File

@@ -31,7 +31,7 @@
enabled,
isdefault,
seniorSdp,
domain,
domain_alias,
server_sipid,
password,
ip,
@@ -55,7 +55,7 @@
<if test="enabled != null ">and enabled = #{enabled}</if>
<if test="isdefault != null ">and isdefault = #{isdefault}</if>
<if test="seniorsdp != null ">and seniorSdp = #{seniorsdp}</if>
<if test="domain != null and domain != ''">and domain = #{domain}</if>
<if test="domain != null and domain != ''">and domain_alias = #{domain}</if>
<if test="serverSipid != null and serverSipid != ''">and server_sipid = #{serverSipid}</if>
<if test="password != null and password != ''">and password = #{password}</if>
<if test="ip != null and ip != ''">and ip = #{ip}</if>
@@ -80,7 +80,7 @@
<if test="enabled != null">enabled,</if>
<if test="isdefault != null">isdefault,</if>
<if test="seniorsdp != null">seniorSdp,</if>
<if test="domain != null and domain != ''">domain,</if>
<if test="domain != null and domain != ''">domain_alias,</if>
<if test="serverSipid != null and serverSipid != ''">server_sipid,</if>
<if test="password != null and password != ''">password,</if>
<if test="ip != null">ip,</if>
@@ -120,7 +120,7 @@
<if test="enabled != null">enabled = #{enabled},</if>
<if test="isdefault != null">isdefault = #{isdefault},</if>
<if test="seniorsdp != null">seniorSdp = #{seniorsdp},</if>
<if test="domain != null and domain != ''">domain = #{domain},</if>
<if test="domain != null and domain != ''">domain_alias = #{domain},</if>
<if test="serverSipid != null and serverSipid != ''">server_sipid = #{serverSipid},</if>
<if test="password != null and password != ''">password = #{password},</if>
<if test="ip != null">ip = #{ip},</if>

12
springboot/sql/dameng/fastbee-v2.1.sql
View File

@@ -748,6 +748,8 @@ CREATE TABLE "GEN_TABLE"
"TABLE_ID" BIGINT IDENTITY(1,1) NOT NULL,
"TABLE_NAME" VARCHAR(200) DEFAULT ''
NULL,
"DATA_NAME" VARCHAR(200) DEFAULT ''
NULL,
"TABLE_COMMENT" VARCHAR(500) DEFAULT ''
NULL,
"SUB_TABLE_NAME" VARCHAR(64) NULL,
@@ -1603,7 +1605,7 @@ CREATE TABLE "SIP_CONFIG"
"ENABLED" TINYINT NULL,
"ISDEFAULT" TINYINT NULL,
"SENIORSDP" TINYINT NULL,
"DOMAIN" VARCHAR(10) DEFAULT ''
"DOMAIN_ALIAS" VARCHAR(10) DEFAULT ''
NOT NULL,
"SERVER_SIPID" VARCHAR(20) DEFAULT ''
NOT NULL,
@@ -2325,10 +2327,10 @@ INSERT INTO "QRTZ_TRIGGERS"("SCHED_NAME","TRIGGER_NAME","TRIGGER_GROUP","JOB_NAM
INSERT INTO "QRTZ_TRIGGERS"("SCHED_NAME","TRIGGER_NAME","TRIGGER_GROUP","JOB_NAME","JOB_GROUP","DESCRIPTION","NEXT_FIRE_TIME","PREV_FIRE_TIME","PRIORITY","TRIGGER_STATE","TRIGGER_TYPE","START_TIME","END_TIME","CALENDAR_NAME","MISFIRE_INSTR","JOB_DATA") VALUES('RuoyiScheduler','TASK_CLASS_NAME5','SYSTEM','TASK_CLASS_NAME5','SYSTEM',null,1680024000000,-1,5,'WAITING','CRON',1680023951000,0,null,-1,'');
SET IDENTITY_INSERT "SIP_CONFIG" ON;
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(38,117,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2023-03-16 21:26:18.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',TO_DATE('2023-03-16 21:26:24.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(39,118,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2023-04-11 21:11:54.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(41,135,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2024-01-08 22:14:35.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(42,131,'',0,0,null,'3402000000','34020000002000000001','12345678','192.168.5.27',5061,'0','',TO_DATE('2025-03-19 16:26:04.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN_ALIAS","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(38,117,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2023-03-16 21:26:18.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',TO_DATE('2023-03-16 21:26:24.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN_ALIAS","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(39,118,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2023-04-11 21:11:54.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN_ALIAS","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(41,135,'',1,1,null,'3402000000','34020000002000000001','12345678','177.7.0.13',5061,'0','',TO_DATE('2024-01-08 22:14:35.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
INSERT INTO "SIP_CONFIG"("ID","PRODUCT_ID","PRODUCT_NAME","ENABLED","ISDEFAULT","SENIORSDP","DOMAIN_ALIAS","SERVER_SIPID","PASSWORD","IP","PORT","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(42,131,'',0,0,null,'3402000000','34020000002000000001','12345678','192.168.5.27',5061,'0','',TO_DATE('2025-03-19 16:26:04.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
SET IDENTITY_INSERT "SIP_CONFIG" OFF;
SET IDENTITY_INSERT "SIP_DEVICE" ON;

3
springboot/sql/fastbee.sql
View File

@@ -24,6 +24,7 @@ DROP TABLE IF EXISTS `gen_table`;
CREATE TABLE `gen_table` (
`table_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
`table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '表名称',
`data_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '数据源名称',
`table_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '表描述',
`sub_table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联子表的表名',
`sub_table_fk_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子表关联的外键名',
@@ -1530,7 +1531,7 @@ CREATE TABLE `sip_config` (
`enabled` tinyint(1) NULL DEFAULT NULL COMMENT '使能开关',
`isdefault` tinyint(1) NULL DEFAULT NULL COMMENT '系统默认配置',
`seniorSdp` tinyint(1) NULL DEFAULT NULL COMMENT '拓展sdp',
`domain` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '服务器域',
`domain_alias` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '服务器域',
`server_sipid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '服务器sipid',
`password` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'sip认证密码',
`ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sip接入IP',

12
springboot/sql/postgres/fastbee-v2.1.sql
View File

@@ -22,6 +22,7 @@ DROP TABLE IF EXISTS "public"."gen_table";
CREATE TABLE "public"."gen_table" (
"table_id" int8 NOT NULL,
"table_name" varchar(200),
"data_name" varchar(200),
"table_comment" varchar(500),
"sub_table_name" varchar(64),
"sub_table_fk_name" varchar(64),
@@ -44,6 +45,7 @@ CREATE TABLE "public"."gen_table" (
;
COMMENT ON COLUMN "public"."gen_table"."table_id" IS '编号';
COMMENT ON COLUMN "public"."gen_table"."table_name" IS '表名称';
COMMENT ON COLUMN "public"."gen_table"."data_name" IS '数据源名称';
COMMENT ON COLUMN "public"."gen_table"."table_comment" IS '表描述';
COMMENT ON COLUMN "public"."gen_table"."sub_table_name" IS '关联子表的表名';
COMMENT ON COLUMN "public"."gen_table"."sub_table_fk_name" IS '子表关联的外键名';
@@ -2221,7 +2223,7 @@ CREATE TABLE "public"."sip_config" (
"enabled" int2,
"isdefault" int2,
"seniorSdp" int2,
"domain" varchar(10) NOT NULL,
"domain_alias" varchar(10) NOT NULL,
"server_sipid" varchar(20) NOT NULL,
"password" varchar(20) NOT NULL,
"ip" varchar(32),
@@ -2257,10 +2259,10 @@ COMMENT ON TABLE "public"."sip_config" IS 'sip系统配置';
-- Records of sip_config
-- ----------------------------
BEGIN;
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (38, 117, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2023-03-16 21:26:18', '', '2023-03-16 21:26:24', NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (39, 118, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2023-04-11 21:11:54', '', NULL, NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (41, 135, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2024-01-08 22:14:35', '', NULL, NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (42, 131, '', 0, 0, NULL, '3402000000', '34020000002000000001', '12345678', '192.168.5.27', 5061, '0', '', '2025-03-19 16:26:04', '', NULL, NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain_alias", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (38, 117, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2023-03-16 21:26:18', '', '2023-03-16 21:26:24', NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain_alias", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (39, 118, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2023-04-11 21:11:54', '', NULL, NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain_alias", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (41, 135, '', 1, 1, NULL, '3402000000', '34020000002000000001', '12345678', '177.7.0.13', 5061, '0', '', '2024-01-08 22:14:35', '', NULL, NULL);
INSERT INTO "public"."sip_config" ("id", "product_id", "product_name", "enabled", "isdefault", "seniorSdp", "domain_alias", "server_sipid", "password", "ip", "port", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (42, 131, '', 0, 0, NULL, '3402000000', '34020000002000000001', '12345678', '192.168.5.27', 5061, '0', '', '2025-03-19 16:26:04', '', NULL, NULL);
COMMIT;
-- ----------------------------

14
springboot/sql/sqlserver/fastbee-v2.1.sql
View File

@@ -25,6 +25,7 @@ GO
CREATE TABLE [dbo].[gen_table] (
[table_id] bigint NOT NULL,
[table_name] nvarchar(200) NULL,
[data_name] nvarchar(200) NULL,
[table_comment] nvarchar(500) NULL,
[sub_table_name] nvarchar(64) NULL,
[sub_table_fk_name] nvarchar(64) NULL,
@@ -60,6 +61,13 @@ EXEC sp_addextendedproperty
'COLUMN', N'table_name'
GO
EXEC sp_addextendedproperty
'MS_Description', N'数据源名称',
'SCHEMA', N'dbo',
'TABLE', N'gen_table',
'COLUMN', N'data_name'
GO
EXEC sp_addextendedproperty
'MS_Description', N'表描述',
'SCHEMA', N'dbo',
@@ -5764,7 +5772,7 @@ CREATE TABLE [dbo].[sip_config] (
[enabled] tinyint NULL,
[isdefault] tinyint NULL,
[seniorSdp] tinyint NULL,
[domain] nvarchar(10) NOT NULL,
[domain_alias] nvarchar(10) NOT NULL,
[server_sipid] nvarchar(20) NOT NULL,
[password] nvarchar(20) NOT NULL,
[ip] nvarchar(32) NULL,
@@ -5824,7 +5832,7 @@ EXEC sp_addextendedproperty
'MS_Description', N'服务器域',
'SCHEMA', N'dbo',
'TABLE', N'sip_config',
'COLUMN', N'domain'
'COLUMN', N'domain_alias'
GO
EXEC sp_addextendedproperty
@@ -5910,7 +5918,7 @@ GO
BEGIN TRANSACTION
GO
INSERT INTO [dbo].[sip_config] ([id], [product_id], [product_name], [enabled], [isdefault], [seniorSdp], [domain], [server_sipid], [password], [ip], [port], [del_flag], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (N'38', N'117', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2023-03-16 21:26:18', N'', N'2023-03-16 21:26:24', NULL), (N'39', N'118', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2023-04-11 21:11:54', N'', NULL, NULL), (N'41', N'135', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2024-01-08 22:14:35', N'', NULL, NULL), (N'42', N'131', N'', N'0', N'0', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'192.168.5.27', N'5061', N'0', N'', N'2025-03-19 16:26:04', N'', NULL, NULL)
INSERT INTO [dbo].[sip_config] ([id], [product_id], [product_name], [enabled], [isdefault], [seniorSdp], [domain_alias], [server_sipid], [password], [ip], [port], [del_flag], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (N'38', N'117', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2023-03-16 21:26:18', N'', N'2023-03-16 21:26:24', NULL), (N'39', N'118', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2023-04-11 21:11:54', N'', NULL, NULL), (N'41', N'135', N'', N'1', N'1', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'177.7.0.13', N'5061', N'0', N'', N'2024-01-08 22:14:35', N'', NULL, NULL), (N'42', N'131', N'', N'0', N'0', NULL, N'3402000000', N'34020000002000000001', N'12345678', N'192.168.5.27', N'5061', N'0', N'', N'2025-03-19 16:26:04', N'', NULL, NULL)
GO
COMMIT