From 32cc5e794e6ffc22ec0c47d49d357ebecbd015a0 Mon Sep 17 00:00:00 2001 From: gx_ma <1773945958@qq.com> Date: Thu, 24 Apr 2025 17:14:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87):=20?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fastbee/generator/domain/GenTable.java | 1 + .../src/main/resources/mapper/SipConfigMapper.xml | 8 ++++---- springboot/sql/dameng/fastbee-v2.1.sql | 12 +++++++----- springboot/sql/fastbee.sql | 3 ++- springboot/sql/postgres/fastbee-v2.1.sql | 12 +++++++----- springboot/sql/sqlserver/fastbee-v2.1.sql | 14 +++++++++++--- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/springboot/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java b/springboot/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java index e42a9396..50189af0 100644 --- a/springboot/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java +++ b/springboot/fastbee-plugs/fastbee-generator/src/main/java/com/fastbee/generator/domain/GenTable.java @@ -33,6 +33,7 @@ public class GenTable extends BaseEntity /** * 数据源名称 */ + @ApiModelProperty("数据源名称") @NotBlank(message = "数据源名称不能为空") private String dataName; diff --git a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipConfigMapper.xml b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipConfigMapper.xml index c3eed7ed..caafc457 100644 --- a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipConfigMapper.xml +++ b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipConfigMapper.xml @@ -31,7 +31,7 @@ enabled, isdefault, seniorSdp, - domain, + domain_alias, server_sipid, password, ip, @@ -55,7 +55,7 @@ and enabled = #{enabled} and isdefault = #{isdefault} and seniorSdp = #{seniorsdp} - and domain = #{domain} + and domain_alias = #{domain} and server_sipid = #{serverSipid} and password = #{password} and ip = #{ip} @@ -80,7 +80,7 @@ enabled, isdefault, seniorSdp, - domain, + domain_alias, server_sipid, password, ip, @@ -120,7 +120,7 @@ enabled = #{enabled}, isdefault = #{isdefault}, seniorSdp = #{seniorsdp}, - domain = #{domain}, + domain_alias = #{domain}, server_sipid = #{serverSipid}, password = #{password}, ip = #{ip}, diff --git a/springboot/sql/dameng/fastbee-v2.1.sql b/springboot/sql/dameng/fastbee-v2.1.sql index 58dbb7e7..e0e98c3a 100644 --- a/springboot/sql/dameng/fastbee-v2.1.sql +++ b/springboot/sql/dameng/fastbee-v2.1.sql @@ -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; diff --git a/springboot/sql/fastbee.sql b/springboot/sql/fastbee.sql index 6d798905..aa99e31e 100644 --- a/springboot/sql/fastbee.sql +++ b/springboot/sql/fastbee.sql @@ -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', diff --git a/springboot/sql/postgres/fastbee-v2.1.sql b/springboot/sql/postgres/fastbee-v2.1.sql index c4767851..85c83464 100644 --- a/springboot/sql/postgres/fastbee-v2.1.sql +++ b/springboot/sql/postgres/fastbee-v2.1.sql @@ -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; -- ---------------------------- diff --git a/springboot/sql/sqlserver/fastbee-v2.1.sql b/springboot/sql/sqlserver/fastbee-v2.1.sql index 99cfa972..40d3ddd2 100644 --- a/springboot/sql/sqlserver/fastbee-v2.1.sql +++ b/springboot/sql/sqlserver/fastbee-v2.1.sql @@ -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