From 1e7bd72bfa74a22ce38e5a0b3c42e0507c779777 Mon Sep 17 00:00:00 2001
From: gx_ma <1773945958@qq.com>
Date: Thu, 20 Nov 2025 15:33:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90):?=
 =?UTF-8?q?=20=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quartz/SysJobLogMapper.xml         |   2 +-
 .../mapper/SipDeviceChannelMapper.xml         | 104 +++++++--------
 springboot/sql/dameng/fastbee-v2.1.sql        |  22 ++--
 springboot/sql/fastbee.sql                    |  18 +--
 springboot/sql/oracle/fastbee-v2.1.sql        |  40 +++---
 springboot/sql/postgres/fastbee-v2.1.sql      | 118 +++++++++---------
 6 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/springboot/fastbee-plugs/fastbee-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/springboot/fastbee-plugs/fastbee-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index 2ea754ea..9615269c 100644
--- a/springboot/fastbee-plugs/fastbee-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/springboot/fastbee-plugs/fastbee-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- 			sysdate()
+			CURRENT_TIMESTAMP
  		)
 	</insert>
 
diff --git a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceChannelMapper.xml b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceChannelMapper.xml
index 47fca366..93c5cfc7 100644
--- a/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceChannelMapper.xml
+++ b/springboot/fastbee-server/sip-server/src/main/resources/mapper/SipDeviceChannelMapper.xml
@@ -18,26 +18,26 @@
         <result property="registerTime" column="register_time"/>
         <result property="deviceType" column="device_type"/>
         <result property="channelType" column="channel_type"/>
-        <result property="citycode" column="cityCode"/>
-        <result property="civilcode" column="civilCode"/>
+        <result property="citycode" column="city_code"/>
+        <result property="civilcode" column="civil_code"/>
         <result property="manufacture" column="manufacture"/>
         <result property="model" column="model"/>
         <result property="owner" column="owner"/>
         <result property="block" column="block"/>
         <result property="address" column="address"/>
-        <result property="parentid" column="parentId"/>
-        <result property="ipaddress" column="ipAddress"/>
+        <result property="parentid" column="parent_id"/>
+        <result property="ipaddress" column="ip_address"/>
         <result property="port" column="port"/>
         <result property="password" column="password"/>
-        <result property="ptztype" column="PTZType"/>
-        <result property="ptztypetext" column="PTZTypeText"/>
+        <result property="ptztype" column="ptz_type"/>
+        <result property="ptztypetext" column="ptz_type_text"/>
         <result property="status" column="status"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
-        <result property="streamid" column="streamId"/>
-        <result property="subcount" column="subCount"/>
+        <result property="streamid" column="stream_id"/>
+        <result property="subcount" column="sub_count"/>
         <result property="parental" column="parental"/>
-        <result property="hasaudio" column="hasAudio"/>
+        <result property="hasaudio" column="has_audio"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -60,26 +60,26 @@
                register_time,
                device_type,
                channel_type,
-               cityCode,
-               civilCode,
+               city_code,
+               civil_code,
                manufacture,
                model,
                owner,
                block,
                address,
-               parentId,
-               ipAddress,
+               parent_id,
+               ip_address,
                port,
                password,
-               PTZType,
-               PTZTypeText,
+               ptz_type,
+               ptz_type_text,
                status,
                longitude,
                latitude,
-               streamId,
-               subCount,
+               stream_id,
+               sub_count,
                parental,
-               hasAudio,
+               has_audio,
                del_flag,
                create_by,
                create_time,
@@ -104,26 +104,26 @@
             <if test="registerTime != null ">and register_time = #{registerTime}</if>
             <if test="deviceType != null  and deviceType != ''">and device_type = #{deviceType}</if>
             <if test="channelType != null  and channelType != ''">and channel_type = #{channelType}</if>
-            <if test="citycode != null  and citycode != ''">and cityCode = #{citycode}</if>
-            <if test="civilcode != null  and civilcode != ''">and civilCode = #{civilcode}</if>
+            <if test="citycode != null  and citycode != ''">and city_code = #{citycode}</if>
+            <if test="civilcode != null  and civilcode != ''">and civil_code = #{civilcode}</if>
             <if test="manufacture != null  and manufacture != ''">and manufacture = #{manufacture}</if>
             <if test="model != null  and model != ''">and model = #{model}</if>
             <if test="owner != null  and owner != ''">and owner = #{owner}</if>
             <if test="block != null  and block != ''">and block = #{block}</if>
             <if test="address != null  and address != ''">and address = #{address}</if>
-            <if test="parentid != null  and parentid != ''">and parentId = #{parentid}</if>
-            <if test="ipaddress != null  and ipaddress != ''">and ipAddress = #{ipaddress}</if>
+            <if test="parentid != null  and parentid != ''">and parent_id = #{parentid}</if>
+            <if test="ipaddress != null  and ipaddress != ''">and ip_address = #{ipaddress}</if>
             <if test="port != null ">and port = #{port}</if>
             <if test="password != null  and password != ''">and password = #{password}</if>
-            <if test="ptztype != null ">and PTZType = #{ptztype}</if>
-            <if test="ptztypetext != null  and ptztypetext != ''">and PTZTypeText = #{ptztypetext}</if>
+            <if test="ptztype != null ">and ptz_type = #{ptztype}</if>
+            <if test="ptztypetext != null  and ptztypetext != ''">and ptz_type_text = #{ptztypetext}</if>
             <if test="status != null ">and status = #{status}</if>
             <if test="longitude != null ">and longitude = #{longitude}</if>
             <if test="latitude != null ">and latitude = #{latitude}</if>
-            <if test="streamid != null  and streamid != ''">and streamId = #{streamid}</if>
-            <if test="subcount != null ">and subCount = #{subcount}</if>
+            <if test="streamid != null  and streamid != ''">and stream_id = #{streamid}</if>
+            <if test="subcount != null ">and sub_count = #{subcount}</if>
             <if test="parental != null ">and parental = #{parental}</if>
-            <if test="hasaudio != null ">and hasAudio = #{hasaudio}</if>
+            <if test="hasaudio != null ">and has_audio = #{hasaudio}</if>
         </where>
     </select>
 
@@ -147,26 +147,26 @@
             <if test="registerTime != null">register_time,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="channelType != null">channel_type,</if>
-            <if test="citycode != null and citycode != ''">cityCode,</if>
-            <if test="civilcode != null and civilcode != ''">civilCode,</if>
+            <if test="citycode != null and citycode != ''">city_code,</if>
+            <if test="civilcode != null and civilcode != ''">civil_code,</if>
             <if test="manufacture != null and manufacture != ''">manufacture,</if>
             <if test="model != null and model != ''">model,</if>
             <if test="owner != null and owner != ''">owner,</if>
             <if test="block != null and block != ''">block,</if>
             <if test="address != null and address != ''">address,</if>
-            <if test="parentid != null and parentid != ''">parentId,</if>
-            <if test="ipaddress != null">ipAddress,</if>
+            <if test="parentid != null and parentid != ''">parent_id,</if>
+            <if test="ipaddress != null">ip_address,</if>
             <if test="port != null">port,</if>
             <if test="password != null and password != ''">password,</if>
-            <if test="ptztype != null">PTZType,</if>
-            <if test="ptztypetext != null and ptztypetext != ''">PTZTypeText,</if>
+            <if test="ptztype != null">ptz_type,</if>
+            <if test="ptztypetext != null and ptztypetext != ''">ptz_type_text,</if>
             <if test="status != null">status,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
-            <if test="streamid != null and streamid != ''">streamId,</if>
-            <if test="subcount != null">subCount,</if>
+            <if test="streamid != null and streamid != ''">stream_id,</if>
+            <if test="subcount != null">sub_count,</if>
             <if test="parental != null">parental,</if>
-            <if test="hasaudio != null">hasAudio,</if>
+            <if test="hasaudio != null">has_audio,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -231,26 +231,26 @@
             <if test="registerTime != null">register_time = #{registerTime},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="channelType != null">channel_type = #{channelType},</if>
-            <if test="citycode != null and citycode != ''">cityCode = #{citycode},</if>
-            <if test="civilcode != null and civilcode != ''">civilCode = #{civilcode},</if>
+            <if test="citycode != null and citycode != ''">city_code = #{citycode},</if>
+            <if test="civilcode != null and civilcode != ''">civil_code = #{civilcode},</if>
             <if test="manufacture != null and manufacture != ''">manufacture = #{manufacture},</if>
             <if test="model != null and model != ''">model = #{model},</if>
             <if test="owner != null and owner != ''">owner = #{owner},</if>
             <if test="block != null and block != ''">block = #{block},</if>
             <if test="address != null and address != ''">address = #{address},</if>
-            <if test="parentid != null and parentid != ''">parentId = #{parentid},</if>
-            <if test="ipaddress != null">ipAddress = #{ipaddress},</if>
+            <if test="parentid != null and parentid != ''">parent_id = #{parentid},</if>
+            <if test="ipaddress != null">ip_address = #{ipaddress},</if>
             <if test="port != null">port = #{port},</if>
             <if test="password != null and password != ''">password = #{password},</if>
-            <if test="ptztype != null">PTZType = #{ptztype},</if>
-            <if test="ptztypetext != null and ptztypetext != ''">PTZTypeText = #{ptztypetext},</if>
+            <if test="ptztype != null">ptz_type = #{ptztype},</if>
+            <if test="ptztypetext != null and ptztypetext != ''">ptz_type_text = #{ptztypetext},</if>
             <if test="status != null">status = #{status},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="streamid != null and streamid != ''">streamId = #{streamid},</if>
-            <if test="subcount != null">subCount = #{subcount},</if>
+            <if test="streamid != null and streamid != ''">stream_id = #{streamid},</if>
+            <if test="subcount != null">sub_count = #{subcount},</if>
             <if test="parental != null">parental = #{parental},</if>
-            <if test="hasaudio != null">hasAudio = #{hasaudio},</if>
+            <if test="hasaudio != null">has_audio = #{hasaudio},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -287,20 +287,20 @@
     <select id="selectChannelWithCivilCodeAndLength" resultMap="SipDeviceChannelResult">
         <include refid="selectSipDeviceChannelVo"/>
         where device_sip_id = #{deviceSipId}
-        <if test='parentId != null and length != null' > and parentId = #{parentid} or left(channel_sip_id, LENGTH(#{parentId})) = #{parentId} and length(channel_sip_id)=#{length} </if>
-        <if test='parentId == null and length != null' > and parentId = #{parentid} or length(channel_sip_id)=#{length} </if>
-        <if test='parentId == null and length == null' > and parentId = #{parentid} </if>
-        <if test='parentId != null and length == null' > and parentId = #{parentid} or left(channel_sip_id, LENGTH(#{parentId})) = #{parentId} </if>
+        <if test='parent_id != null and length != null' > and parent_id = #{parentid} or left(channel_sip_id, LENGTH(#{parent_id})) = #{parent_id} and length(channel_sip_id)=#{length} </if>
+        <if test='parent_id == null and length != null' > and parent_id = #{parentid} or length(channel_sip_id)=#{length} </if>
+        <if test='parent_id == null and length == null' > and parent_id = #{parentid} </if>
+        <if test='parent_id != null and length == null' > and parent_id = #{parentid} or left(channel_sip_id, LENGTH(#{parent_id})) = #{parentId} </if>
     </select>
 
     <select id="selectChannelByCivilCode" resultMap="SipDeviceChannelResult">
         <include refid="selectSipDeviceChannelVo"/>
-        where device_sip_id = #{deviceSipId} and length(channel_sip_id)>14 and civilCode=#{parentId}
+        where device_sip_id = #{deviceSipId} and length(channel_sip_id)>14 and civil_code=#{parent_id}
     </select>
 
     <select id="selectChannelWithoutCiviCode" resultMap="SipDeviceChannelResult">
         <include refid="selectSipDeviceChannelVo"/>
-        where device_sip_id=#{deviceSipId} and civilCode not in (select civilCode from sip_device_channel where device_sip_id=#{deviceSipId} group by civilCode)
+        where device_sip_id=#{deviceSipId} and civil_code not in (select civil_code from sip_device_channel where device_sip_id=#{deviceSipId} group by civil_code)
     </select>
 
     <select id="getChannelMinLength" resultType="Integer">
@@ -312,7 +312,7 @@
     <update id="updateChannelStreamId" parameterType="SipDeviceChannel">
         update sip_device_channel
         <trim prefix="SET" suffixOverrides=",">
-            <if test="streamid != null and streamid != ''">streamId = #{streamid},</if>
+            <if test="streamid != null and streamid != ''">stream_id = #{streamid},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/springboot/sql/dameng/fastbee-v2.1.sql b/springboot/sql/dameng/fastbee-v2.1.sql
index 0c68f4c0..b9271a8d 100644
--- a/springboot/sql/dameng/fastbee-v2.1.sql
+++ b/springboot/sql/dameng/fastbee-v2.1.sql
@@ -1685,9 +1685,9 @@ CREATE TABLE "SIP_DEVICE_CHANNEL"
  NULL,
  "CHANNEL_TYPE" VARCHAR(64) DEFAULT ''
  NULL,
- "CITYCODE" VARCHAR(64) DEFAULT ''
+ "CITY_CODE" VARCHAR(64) DEFAULT ''
  NOT NULL,
- "CIVILCODE" VARCHAR(64) DEFAULT ''
+ "CIVIL_CODE" VARCHAR(64) DEFAULT ''
  NOT NULL,
  "MANUFACTURE" VARCHAR(64) DEFAULT ''
  NOT NULL,
@@ -1699,29 +1699,29 @@ CREATE TABLE "SIP_DEVICE_CHANNEL"
  NOT NULL,
  "ADDRESS" VARCHAR(64) DEFAULT ''
  NOT NULL,
- "PARENTID" VARCHAR(64) DEFAULT ''
+ "PARENT_ID" VARCHAR(64) DEFAULT ''
  NOT NULL,
- "IPADDRESS" VARCHAR(32) DEFAULT ''
+ "IP_ADDRESS" VARCHAR(32) DEFAULT ''
  NULL,
  "PORT" BIGINT DEFAULT 0
  NULL,
  "PASSWORD" VARCHAR(64) DEFAULT ''
  NOT NULL,
- "PTZTYPE" BIGINT DEFAULT 0
+ "PTZ_TYPE" BIGINT DEFAULT 0
  NOT NULL,
- "PTZTYPETEXT" VARCHAR(64) DEFAULT ''
+ "PTZ_TYPE_TEXT" VARCHAR(64) DEFAULT ''
  NOT NULL,
  "STATUS" TINYINT DEFAULT 1
  NOT NULL,
  "LONGITUDE" NUMBER(11,6) NULL,
  "LATITUDE" NUMBER(11,6) NULL,
- "STREAMID" VARCHAR(64) DEFAULT ''
+ "STREAM_ID" VARCHAR(64) DEFAULT ''
  NOT NULL,
- "SUBCOUNT" BIGINT DEFAULT 0
+ "SUB_COUNT" BIGINT DEFAULT 0
  NOT NULL,
  "PARENTAL" TINYINT DEFAULT 1
  NOT NULL,
- "HASAUDIO" TINYINT DEFAULT 1
+ "HAS_AUDIO" TINYINT DEFAULT 1
  NOT NULL,
  "DEL_FLAG" CHAR(1) DEFAULT '0'
  NOT NULL,
@@ -2344,8 +2344,8 @@ INSERT INTO "SIP_DEVICE"("DEVICE_ID","PRODUCT_ID","PRODUCT_NAME","DEVICE_SIP_ID"
 
 SET IDENTITY_INSERT "SIP_DEVICE" OFF;
 SET IDENTITY_INSERT "SIP_DEVICE_CHANNEL" ON;
-INSERT INTO "SIP_DEVICE_CHANNEL"("ID","TENANT_ID","TENANT_NAME","PRODUCT_ID","PRODUCT_NAME","USER_ID","USER_NAME","DEVICE_SIP_ID","CHANNEL_SIP_ID","CHANNEL_NAME","REGISTER_TIME","DEVICE_TYPE","CHANNEL_TYPE","CITYCODE","CIVILCODE","MANUFACTURE","MODEL","OWNER","BLOCK","ADDRESS","PARENTID","IPADDRESS","PORT","PASSWORD","PTZTYPE","PTZTYPETEXT","STATUS","LONGITUDE","LATITUDE","STREAMID","SUBCOUNT","PARENTAL","HASAUDIO","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(84,1,'admin',118,'监控设备',1,'admin','11010200001320000001','11010200001320000001','IPdome',TO_DATE('2024-01-08 22:16:32.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'132','132','北京市/市辖区/西城区','3402000000','Hikvision','IP Camera','Owner','','Address','34020000002000000001','',0,'',0,'',3,0.000000,0.000000,'gb_play_11010200001320000001_11010200001320000001',0,0,0,'0','',TO_DATE('2023-04-11 21:12:33.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
-INSERT INTO "SIP_DEVICE_CHANNEL"("ID","TENANT_ID","TENANT_NAME","PRODUCT_ID","PRODUCT_NAME","USER_ID","USER_NAME","DEVICE_SIP_ID","CHANNEL_SIP_ID","CHANNEL_NAME","REGISTER_TIME","DEVICE_TYPE","CHANNEL_TYPE","CITYCODE","CIVILCODE","MANUFACTURE","MODEL","OWNER","BLOCK","ADDRESS","PARENTID","IPADDRESS","PORT","PASSWORD","PTZTYPE","PTZTYPETEXT","STATUS","LONGITUDE","LATITUDE","STREAMID","SUBCOUNT","PARENTAL","HASAUDIO","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(102,1,'admin',135,'视频监控',0,'','11010100001320000001','11010100001320000001','IPdome',TO_DATE('2024-01-09 23:35:00.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'132','132','北京市/市辖区/东城区','3402000000','Hikvision','IP Camera','Owner','','Address','34020000002000000001','',0,'',0,'',3,0.000000,0.000000,'',0,0,0,'0','',TO_DATE('2024-01-08 22:15:57.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
+INSERT INTO "SIP_DEVICE_CHANNEL"("ID","TENANT_ID","TENANT_NAME","PRODUCT_ID","PRODUCT_NAME","USER_ID","USER_NAME","DEVICE_SIP_ID","CHANNEL_SIP_ID","CHANNEL_NAME","REGISTER_TIME","DEVICE_TYPE","CHANNEL_TYPE","CITY_CODE","CIVIL_CODE","MANUFACTURE","MODEL","OWNER","BLOCK","ADDRESS","PARENT_ID","IP_ADDRESS","PORT","PASSWORD","PTZ_TYPE","PTZ_TYPE_TEXT","STATUS","LONGITUDE","LATITUDE","STREAM_ID","SUB_COUNT","PARENTAL","HAS_AUDIO","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(84,1,'admin',118,'监控设备',1,'admin','11010200001320000001','11010200001320000001','IPdome',TO_DATE('2024-01-08 22:16:32.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'132','132','北京市/市辖区/西城区','3402000000','Hikvision','IP Camera','Owner','','Address','34020000002000000001','',0,'',0,'',3,0.000000,0.000000,'gb_play_11010200001320000001_11010200001320000001',0,0,0,'0','',TO_DATE('2023-04-11 21:12:33.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
+INSERT INTO "SIP_DEVICE_CHANNEL"("ID","TENANT_ID","TENANT_NAME","PRODUCT_ID","PRODUCT_NAME","USER_ID","USER_NAME","DEVICE_SIP_ID","CHANNEL_SIP_ID","CHANNEL_NAME","REGISTER_TIME","DEVICE_TYPE","CHANNEL_TYPE","CITY_CODE","CIVIL_CODE","MANUFACTURE","MODEL","OWNER","BLOCK","ADDRESS","PARENT_ID","IP_ADDRESS","PORT","PASSWORD","PTZ_TYPE","PTZ_TYPE_TEXT","STATUS","LONGITUDE","LATITUDE","STREAM_ID","SUB_COUNT","PARENTAL","HAS_AUDIO","DEL_FLAG","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","REMARK") VALUES(102,1,'admin',135,'视频监控',0,'','11010100001320000001','11010100001320000001','IPdome',TO_DATE('2024-01-09 23:35:00.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'132','132','北京市/市辖区/东城区','3402000000','Hikvision','IP Camera','Owner','','Address','34020000002000000001','',0,'',0,'',3,0.000000,0.000000,'',0,0,0,'0','',TO_DATE('2024-01-08 22:15:57.000000000','SYYYY-MM-DD HH24:MI:SS.FF9'),'',null,null);
 
 SET IDENTITY_INSERT "SIP_DEVICE_CHANNEL" OFF;
 SET IDENTITY_INSERT "SYS_AUTH_USER" ON;
diff --git a/springboot/sql/fastbee.sql b/springboot/sql/fastbee.sql
index 3b32d928..91400e20 100644
--- a/springboot/sql/fastbee.sql
+++ b/springboot/sql/fastbee.sql
@@ -1612,26 +1612,26 @@ CREATE TABLE `sip_device_channel`  (
   `register_time` datetime NULL DEFAULT NULL COMMENT '注册时间',
   `device_type` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '设备类型',
   `channel_type` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '通道类型',
-  `cityCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '城市编码',
-  `civilCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '行政区域',
+  `city_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '城市编码',
+  `civil_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '行政区域',
   `manufacture` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '厂商名称',
   `model` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '产品型号',
   `owner` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '设备归属',
   `block` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '警区',
   `address` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '安装地址',
-  `parentId` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '父级id',
-  `ipAddress` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '设备入网IP',
+  `parent_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '父级id',
+  `ip_address` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '设备入网IP',
   `port` bigint(10) NULL DEFAULT 0 COMMENT '设备接入端口号',
   `password` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '密码',
-  `PTZType` bigint(20) NOT NULL DEFAULT 0 COMMENT 'PTZ类型',
-  `PTZTypeText` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'PTZ类型描述字符串',
+  `ptz_type` bigint(20) NOT NULL DEFAULT 0 COMMENT 'PTZ类型',
+  `ptz_type_text` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'PTZ类型描述字符串',
   `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '设备状态（1-未激活，2-禁用，3-在线，4-离线）',
   `longitude` double(11, 6) NULL DEFAULT NULL COMMENT '设备经度',
   `latitude` double(11, 6) NULL DEFAULT NULL COMMENT '设备纬度',
-  `streamId` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '流媒体ID',
-  `subCount` bigint(20) NOT NULL DEFAULT 0 COMMENT '子设备数',
+  `stream_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '流媒体ID',
+  `sub_count` bigint(20) NOT NULL DEFAULT 0 COMMENT '子设备数',
   `parental` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否有子设备（1-有, 0-没有）',
-  `hasAudio` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否含有音频（1-有, 0-没有）',
+  `has_audio` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否含有音频（1-有, 0-没有）',
   `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
   `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime NOT NULL COMMENT '创建时间',
diff --git a/springboot/sql/oracle/fastbee-v2.1.sql b/springboot/sql/oracle/fastbee-v2.1.sql
index 9a8cb443..ad8989d6 100644
--- a/springboot/sql/oracle/fastbee-v2.1.sql
+++ b/springboot/sql/oracle/fastbee-v2.1.sql
@@ -2350,26 +2350,26 @@ CREATE TABLE "sip_device_channel" (
   "register_time" DATE,
   "device_type" NVARCHAR2(64),
   "channel_type" NVARCHAR2(64),
-  "cityCode" NVARCHAR2(64) NOT NULL,
-  "civilCode" NVARCHAR2(64) NOT NULL,
+  "city_code" NVARCHAR2(64) NOT NULL,
+  "civil_code" NVARCHAR2(64) NOT NULL,
   "manufacture" NVARCHAR2(64) NOT NULL,
   "model" NVARCHAR2(64) NOT NULL,
   "owner" NVARCHAR2(64) NOT NULL,
   "block" NVARCHAR2(64) NOT NULL,
   "address" NVARCHAR2(64) NOT NULL,
-  "parentId" NVARCHAR2(64) NOT NULL,
-  "ipAddress" NVARCHAR2(32),
+  "parent_id" NVARCHAR2(64) NOT NULL,
+  "ip_address" NVARCHAR2(32),
   "port" NUMBER(20),
   "password" NVARCHAR2(64) NOT NULL,
-  "PTZType" NUMBER(20) NOT NULL,
-  "PTZTypeText" NVARCHAR2(64) NOT NULL,
+  "ptz_type" NUMBER(20) NOT NULL,
+  "ptz_type_text" NVARCHAR2(64) NOT NULL,
   "status" NUMBER(4) NOT NULL,
   "longitude" NUMBER(11,6),
   "latitude" NUMBER(11,6),
-  "streamId" NVARCHAR2(64) NOT NULL,
-  "subCount" NUMBER(20) NOT NULL,
+  "stream_id" NVARCHAR2(64) NOT NULL,
+  "sub_count" NUMBER(20) NOT NULL,
   "parental" NUMBER(4) NOT NULL,
-  "hasAudio" NUMBER(4) NOT NULL,
+  "has_audio" NUMBER(4) NOT NULL,
   "del_flag" NCHAR(1) NOT NULL,
   "create_by" NVARCHAR2(64) NOT NULL,
   "create_time" DATE NOT NULL,
@@ -2391,26 +2391,26 @@ COMMENT ON COLUMN "sip_device_channel"."channel_name" IS '通道名称';
 COMMENT ON COLUMN "sip_device_channel"."register_time" IS '注册时间';
 COMMENT ON COLUMN "sip_device_channel"."device_type" IS '设备类型';
 COMMENT ON COLUMN "sip_device_channel"."channel_type" IS '通道类型';
-COMMENT ON COLUMN "sip_device_channel"."cityCode" IS '城市编码';
-COMMENT ON COLUMN "sip_device_channel"."civilCode" IS '行政区域';
+COMMENT ON COLUMN "sip_device_channel"."city_code" IS '城市编码';
+COMMENT ON COLUMN "sip_device_channel"."civil_code" IS '行政区域';
 COMMENT ON COLUMN "sip_device_channel"."manufacture" IS '厂商名称';
 COMMENT ON COLUMN "sip_device_channel"."model" IS '产品型号';
 COMMENT ON COLUMN "sip_device_channel"."owner" IS '设备归属';
 COMMENT ON COLUMN "sip_device_channel"."block" IS '警区';
 COMMENT ON COLUMN "sip_device_channel"."address" IS '安装地址';
-COMMENT ON COLUMN "sip_device_channel"."parentId" IS '父级id';
-COMMENT ON COLUMN "sip_device_channel"."ipAddress" IS '设备入网IP';
+COMMENT ON COLUMN "sip_device_channel"."parent_id" IS '父级id';
+COMMENT ON COLUMN "sip_device_channel"."ip_address" IS '设备入网IP';
 COMMENT ON COLUMN "sip_device_channel"."port" IS '设备接入端口号';
 COMMENT ON COLUMN "sip_device_channel"."password" IS '密码';
-COMMENT ON COLUMN "sip_device_channel"."PTZType" IS 'PTZ类型';
-COMMENT ON COLUMN "sip_device_channel"."PTZTypeText" IS 'PTZ类型描述字符串';
+COMMENT ON COLUMN "sip_device_channel"."ptz_type" IS 'PTZ类型';
+COMMENT ON COLUMN "sip_device_channel"."ptx_type_text" IS 'PTZ类型描述字符串';
 COMMENT ON COLUMN "sip_device_channel"."status" IS '设备状态（1-未激活，2-禁用，3-在线，4-离线）';
 COMMENT ON COLUMN "sip_device_channel"."longitude" IS '设备经度';
 COMMENT ON COLUMN "sip_device_channel"."latitude" IS '设备纬度';
-COMMENT ON COLUMN "sip_device_channel"."streamId" IS '流媒体ID';
-COMMENT ON COLUMN "sip_device_channel"."subCount" IS '子设备数';
+COMMENT ON COLUMN "sip_device_channel"."stream_id" IS '流媒体ID';
+COMMENT ON COLUMN "sip_device_channel"."sub_count" IS '子设备数';
 COMMENT ON COLUMN "sip_device_channel"."parental" IS '是否有子设备（1-有, 0-没有）';
-COMMENT ON COLUMN "sip_device_channel"."hasAudio" IS '是否含有音频（1-有, 0-没有）';
+COMMENT ON COLUMN "sip_device_channel"."has_audio" IS '是否含有音频（1-有, 0-没有）';
 COMMENT ON COLUMN "sip_device_channel"."del_flag" IS '删除标志（0代表存在 2代表删除）';
 COMMENT ON COLUMN "sip_device_channel"."create_by" IS '创建者';
 COMMENT ON COLUMN "sip_device_channel"."create_time" IS '创建时间';
@@ -2422,8 +2422,8 @@ COMMENT ON TABLE "sip_device_channel" IS '监控设备通道信息';
 -- ----------------------------
 -- Records of sip_device_channel
 -- ----------------------------
-INSERT INTO "sip_device_channel" ("id", "tenant_id", "tenant_name", "product_id", "product_name", "user_id", "user_name", "device_sip_id", "channel_sip_id", "channel_name", "register_time", "device_type", "channel_type", "cityCode", "civilCode", "manufacture", "model", "owner", "block", "address", "parentId", "ipAddress", "port", "password", "PTZType", "PTZTypeText", "status", "longitude", "latitude", "streamId", "subCount", "parental", "hasAudio", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES ('84', '1', 'admin', '118', '监控设备', '1', 'admin', '11010200001320000001', '11010200001320000001', 'IPdome', TO_DATE('2024-01-08 22:16:32', 'SYYYY-MM-DD HH24:MI:SS'), '132', '132', '北京市/市辖区/西城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', '0', '', '0', '', '3', '0.000000', '0.000000', 'gb_play_11010200001320000001_11010200001320000001', '0', '0', '0', '0', '', TO_DATE('2023-04-11 21:12:33', 'SYYYY-MM-DD HH24:MI:SS'), '', NULL, NULL);
-INSERT INTO "sip_device_channel" ("id", "tenant_id", "tenant_name", "product_id", "product_name", "user_id", "user_name", "device_sip_id", "channel_sip_id", "channel_name", "register_time", "device_type", "channel_type", "cityCode", "civilCode", "manufacture", "model", "owner", "block", "address", "parentId", "ipAddress", "port", "password", "PTZType", "PTZTypeText", "status", "longitude", "latitude", "streamId", "subCount", "parental", "hasAudio", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES ('102', '1', 'admin', '135', '视频监控', '0', '', '11010100001320000001', '11010100001320000001', 'IPdome', TO_DATE('2024-01-09 23:35:00', 'SYYYY-MM-DD HH24:MI:SS'), '132', '132', '北京市/市辖区/东城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', '0', '', '0', '', '3', '0.000000', '0.000000', '', '0', '0', '0', '0', '', TO_DATE('2024-01-08 22:15:57', 'SYYYY-MM-DD HH24:MI:SS'), '', NULL, NULL);
+INSERT INTO "sip_device_channel" VALUES ('84', '1', 'admin', '118', '监控设备', '1', 'admin', '11010200001320000001', '11010200001320000001', 'IPdome', TO_DATE('2024-01-08 22:16:32', 'SYYYY-MM-DD HH24:MI:SS'), '132', '132', '北京市/市辖区/西城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', '0', '', '0', '', '3', '0.000000', '0.000000', 'gb_play_11010200001320000001_11010200001320000001', '0', '0', '0', '0', '', TO_DATE('2023-04-11 21:12:33', 'SYYYY-MM-DD HH24:MI:SS'), '', NULL, NULL);
+INSERT INTO "sip_device_channel" VALUES ('102', '1', 'admin', '135', '视频监控', '0', '', '11010100001320000001', '11010100001320000001', 'IPdome', TO_DATE('2024-01-09 23:35:00', 'SYYYY-MM-DD HH24:MI:SS'), '132', '132', '北京市/市辖区/东城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', '0', '', '0', '', '3', '0.000000', '0.000000', '', '0', '0', '0', '0', '', TO_DATE('2024-01-08 22:15:57', 'SYYYY-MM-DD HH24:MI:SS'), '', NULL, NULL);
 COMMIT;
 COMMIT;
 
diff --git a/springboot/sql/postgres/fastbee-v2.1.sql b/springboot/sql/postgres/fastbee-v2.1.sql
index ce9142c1..f4a6cd66 100644
--- a/springboot/sql/postgres/fastbee-v2.1.sql
+++ b/springboot/sql/postgres/fastbee-v2.1.sql
@@ -20,7 +20,7 @@
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."gen_table";
 CREATE TABLE "public"."gen_table" (
-  "table_id" int8 NOT NULL,
+  "table_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "table_name" varchar(200),
   "data_name" varchar(200),
   "table_comment" varchar(500),
@@ -77,7 +77,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."gen_table_column";
 CREATE TABLE "public"."gen_table_column" (
-  "column_id" int8 NOT NULL,
+  "column_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "table_id" varchar(64),
   "column_name" varchar(200),
   "column_comment" varchar(500),
@@ -136,7 +136,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_category";
 CREATE TABLE "public"."iot_category" (
-  "category_id" int8 NOT NULL,
+  "category_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 8 INCREMENT BY 1),
   "category_name" varchar(64) NOT NULL,
   "tenant_id" int8 NOT NULL,
   "tenant_name" varchar(30) NOT NULL,
@@ -184,7 +184,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_device";
 CREATE TABLE "public"."iot_device" (
-  "device_id" int8 NOT NULL,
+  "device_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 141 INCREMENT BY 1),
   "device_name" varchar(64) NOT NULL,
   "product_id" int8 NOT NULL,
   "product_name" varchar(64) NOT NULL,
@@ -287,7 +287,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_device_job";
 CREATE TABLE "public"."iot_device_job" (
-  "job_id" int8 NOT NULL,
+  "job_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 6 INCREMENT BY 1),
   "job_name" varchar(64) NOT NULL,
   "job_group" varchar(64) NOT NULL,
   "cron_expression" varchar(255),
@@ -350,7 +350,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_device_log";
 CREATE TABLE "public"."iot_device_log" (
-  "log_id" int8 NOT NULL,
+  "log_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "identify" varchar(64) NOT NULL,
   "model_name" varchar(255),
   "log_type" int2 NOT NULL,
@@ -399,7 +399,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_device_template";
 CREATE TABLE "public"."iot_device_template" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 40 INCREMENT BY 1),
   "product_id" int8,
   "template_id" int8
 )
@@ -483,7 +483,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_event_log";
 CREATE TABLE "public"."iot_event_log" (
-  "log_id" int8 NOT NULL,
+  "log_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "identify" varchar(64) NOT NULL,
   "model_name" varchar(255),
   "log_type" int2 NOT NULL,
@@ -532,7 +532,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_function_log";
 CREATE TABLE "public"."iot_function_log" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "identify" varchar(64) NOT NULL,
   "fun_type" int4 NOT NULL,
   "fun_value" varchar(64) NOT NULL,
@@ -581,7 +581,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_group";
 CREATE TABLE "public"."iot_group" (
-  "group_id" int8 NOT NULL,
+  "group_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 7 INCREMENT BY 1),
   "group_name" varchar(64) NOT NULL,
   "group_order" int2 NOT NULL,
   "user_id" int8 NOT NULL,
@@ -623,7 +623,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_product";
 CREATE TABLE "public"."iot_product" (
-  "product_id" int8 NOT NULL,
+  "product_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 89 INCREMENT BY 1),
   "product_name" varchar(64) NOT NULL,
   "protocol_code" varchar(64),
   "category_id" int8 NOT NULL,
@@ -691,7 +691,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_product_authorize";
 CREATE TABLE "public"."iot_product_authorize" (
-  "authorize_id" int8 NOT NULL,
+  "authorize_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "authorize_code" varchar(32) NOT NULL,
   "product_id" int8 NOT NULL,
   "device_id" int8,
@@ -734,7 +734,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_protocol";
 CREATE TABLE "public"."iot_protocol" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 2 INCREMENT BY 1),
   "protocol_code" varchar(60) NOT NULL,
   "protocol_name" varchar(60) NOT NULL,
   "protocol_file_url" varchar(500) NOT NULL,
@@ -770,7 +770,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_scene";
 CREATE TABLE "public"."iot_scene" (
-  "scene_id" int8 NOT NULL,
+  "scene_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "scene_name" varchar(64) NOT NULL,
   "chain_name" varchar(32),
   "enable" int2,
@@ -991,7 +991,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_social_platform";
 CREATE TABLE "public"."iot_social_platform" (
-  "social_platform_id" int4 NOT NULL,
+  "social_platform_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "platform" varchar(32) NOT NULL,
   "status" char(1) NOT NULL,
   "client_id" varchar(100) NOT NULL,
@@ -1036,7 +1036,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_social_user";
 CREATE TABLE "public"."iot_social_user" (
-  "social_user_id" int4 NOT NULL,
+  "social_user_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 211 INCREMENT BY 1),
   "uuid" varchar(64) NOT NULL,
   "source" varchar(32) NOT NULL,
   "access_token" varchar(255),
@@ -1321,7 +1321,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_things_model";
 CREATE TABLE "public"."iot_things_model" (
-  "model_id" int8 NOT NULL,
+  "model_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 510 INCREMENT BY 1),
   "model_name" varchar(64) NOT NULL,
   "product_id" int8 NOT NULL,
   "product_name" varchar(64) NOT NULL,
@@ -1443,7 +1443,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."iot_things_model_template";
 CREATE TABLE "public"."iot_things_model_template" (
-  "template_id" int8 NOT NULL,
+  "template_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 344 INCREMENT BY 1),
   "template_name" varchar(64) NOT NULL,
   "tenant_id" int8 NOT NULL,
   "tenant_name" varchar(30) NOT NULL,
@@ -1570,7 +1570,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."media_server";
 CREATE TABLE "public"."media_server" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 8 INCREMENT BY 1),
   "server_id" varchar(30) NOT NULL,
   "tenant_id" int8 NOT NULL,
   "tenant_name" varchar(30) NOT NULL,
@@ -1640,7 +1640,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."news";
 CREATE TABLE "public"."news" (
-  "news_id" int8 NOT NULL,
+  "news_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 9 INCREMENT BY 1),
   "title" varchar(64) NOT NULL,
   "content" text NOT NULL,
   "img_url" varchar(128) NOT NULL,
@@ -1695,7 +1695,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."news_category";
 CREATE TABLE "public"."news_category" (
-  "category_id" int8 NOT NULL,
+  "category_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 3 INCREMENT BY 1),
   "category_name" varchar(64) NOT NULL,
   "order_num" int4 NOT NULL,
   "del_flag" char(1),
@@ -2217,7 +2217,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sip_config";
 CREATE TABLE "public"."sip_config" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 43 INCREMENT BY 1),
   "product_id" int8 NOT NULL,
   "product_name" varchar(64) NOT NULL,
   "enabled" int2,
@@ -2242,7 +2242,7 @@ COMMENT ON COLUMN "public"."sip_config"."product_name" IS '产品名称';
 COMMENT ON COLUMN "public"."sip_config"."enabled" IS '使能开关';
 COMMENT ON COLUMN "public"."sip_config"."isdefault" IS '系统默认配置';
 COMMENT ON COLUMN "public"."sip_config"."seniorSdp" IS '拓展sdp';
-COMMENT ON COLUMN "public"."sip_config"."domain" IS '服务器域';
+COMMENT ON COLUMN "public"."sip_config"."domain_alias" IS '服务器域';
 COMMENT ON COLUMN "public"."sip_config"."server_sipid" IS '服务器sipid';
 COMMENT ON COLUMN "public"."sip_config"."password" IS 'sip认证密码';
 COMMENT ON COLUMN "public"."sip_config"."ip" IS 'sip接入IP';
@@ -2270,7 +2270,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sip_device";
 CREATE TABLE "public"."sip_device" (
-  "device_id" int8 NOT NULL,
+  "device_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 20 INCREMENT BY 1),
   "product_id" int8 NOT NULL,
   "product_name" varchar(64) NOT NULL,
   "device_sip_id" varchar(64) NOT NULL,
@@ -2337,7 +2337,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sip_device_channel";
 CREATE TABLE "public"."sip_device_channel" (
-  "id" int8 NOT NULL,
+  "id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 103 INCREMENT BY 1),
   "tenant_id" int8 NOT NULL,
   "tenant_name" varchar(30) NOT NULL,
   "product_id" int8 NOT NULL,
@@ -2350,26 +2350,26 @@ CREATE TABLE "public"."sip_device_channel" (
   "register_time" timestamp,
   "device_type" varchar(64),
   "channel_type" varchar(64),
-  "cityCode" varchar(64) NOT NULL,
-  "civilCode" varchar(64) NOT NULL,
+  "city_code" varchar(64) NOT NULL,
+  "civil_code" varchar(64) NOT NULL,
   "manufacture" varchar(64) NOT NULL,
   "model" varchar(64) NOT NULL,
   "owner" varchar(64) NOT NULL,
   "block" varchar(64) NOT NULL,
   "address" varchar(64) NOT NULL,
-  "parentId" varchar(64) NOT NULL,
-  "ipAddress" varchar(32),
+  "parent_id" varchar(64) NOT NULL,
+  "ip_address" varchar(32),
   "port" int8,
   "password" varchar(64) NOT NULL,
-  "PTZType" int8 NOT NULL,
-  "PTZTypeText" varchar(64) NOT NULL,
+  "ptz_type" int8 NOT NULL,
+  "ptz_type_text" varchar(64) NOT NULL,
   "status" int2 NOT NULL,
   "longitude" float8,
   "latitude" float8,
-  "streamId" varchar(64) NOT NULL,
-  "subCount" int8 NOT NULL,
+  "stream_id" varchar(64) NOT NULL,
+  "sub_count" int8 NOT NULL,
   "parental" int2 NOT NULL,
-  "hasAudio" int2 NOT NULL,
+  "has_audio" int2 NOT NULL,
   "del_flag" char(1) NOT NULL,
   "create_by" varchar(64) NOT NULL,
   "create_time" timestamp NOT NULL,
@@ -2391,26 +2391,26 @@ COMMENT ON COLUMN "public"."sip_device_channel"."channel_name" IS '通道名称'
 COMMENT ON COLUMN "public"."sip_device_channel"."register_time" IS '注册时间';
 COMMENT ON COLUMN "public"."sip_device_channel"."device_type" IS '设备类型';
 COMMENT ON COLUMN "public"."sip_device_channel"."channel_type" IS '通道类型';
-COMMENT ON COLUMN "public"."sip_device_channel"."cityCode" IS '城市编码';
-COMMENT ON COLUMN "public"."sip_device_channel"."civilCode" IS '行政区域';
+COMMENT ON COLUMN "public"."sip_device_channel"."city_code" IS '城市编码';
+COMMENT ON COLUMN "public"."sip_device_channel"."civil_code" IS '行政区域';
 COMMENT ON COLUMN "public"."sip_device_channel"."manufacture" IS '厂商名称';
 COMMENT ON COLUMN "public"."sip_device_channel"."model" IS '产品型号';
 COMMENT ON COLUMN "public"."sip_device_channel"."owner" IS '设备归属';
 COMMENT ON COLUMN "public"."sip_device_channel"."block" IS '警区';
 COMMENT ON COLUMN "public"."sip_device_channel"."address" IS '安装地址';
-COMMENT ON COLUMN "public"."sip_device_channel"."parentId" IS '父级id';
-COMMENT ON COLUMN "public"."sip_device_channel"."ipAddress" IS '设备入网IP';
+COMMENT ON COLUMN "public"."sip_device_channel"."parent_id" IS '父级id';
+COMMENT ON COLUMN "public"."sip_device_channel"."ip_address" IS '设备入网IP';
 COMMENT ON COLUMN "public"."sip_device_channel"."port" IS '设备接入端口号';
 COMMENT ON COLUMN "public"."sip_device_channel"."password" IS '密码';
-COMMENT ON COLUMN "public"."sip_device_channel"."PTZType" IS 'PTZ类型';
-COMMENT ON COLUMN "public"."sip_device_channel"."PTZTypeText" IS 'PTZ类型描述字符串';
+COMMENT ON COLUMN "public"."sip_device_channel"."ptz_type" IS 'PTZ类型';
+COMMENT ON COLUMN "public"."sip_device_channel"."ptz_type_text" IS 'PTZ类型描述字符串';
 COMMENT ON COLUMN "public"."sip_device_channel"."status" IS '设备状态（1-未激活，2-禁用，3-在线，4-离线）';
 COMMENT ON COLUMN "public"."sip_device_channel"."longitude" IS '设备经度';
 COMMENT ON COLUMN "public"."sip_device_channel"."latitude" IS '设备纬度';
-COMMENT ON COLUMN "public"."sip_device_channel"."streamId" IS '流媒体ID';
-COMMENT ON COLUMN "public"."sip_device_channel"."subCount" IS '子设备数';
+COMMENT ON COLUMN "public"."sip_device_channel"."stream_id" IS '流媒体ID';
+COMMENT ON COLUMN "public"."sip_device_channel"."sub_count" IS '子设备数';
 COMMENT ON COLUMN "public"."sip_device_channel"."parental" IS '是否有子设备（1-有, 0-没有）';
-COMMENT ON COLUMN "public"."sip_device_channel"."hasAudio" IS '是否含有音频（1-有, 0-没有）';
+COMMENT ON COLUMN "public"."sip_device_channel"."has_audio" IS '是否含有音频（1-有, 0-没有）';
 COMMENT ON COLUMN "public"."sip_device_channel"."del_flag" IS '删除标志（0代表存在 2代表删除）';
 COMMENT ON COLUMN "public"."sip_device_channel"."create_by" IS '创建者';
 COMMENT ON COLUMN "public"."sip_device_channel"."create_time" IS '创建时间';
@@ -2423,8 +2423,8 @@ COMMENT ON TABLE "public"."sip_device_channel" IS '监控设备通道信息';
 -- Records of sip_device_channel
 -- ----------------------------
 BEGIN;
-INSERT INTO "public"."sip_device_channel" ("id", "tenant_id", "tenant_name", "product_id", "product_name", "user_id", "user_name", "device_sip_id", "channel_sip_id", "channel_name", "register_time", "device_type", "channel_type", "cityCode", "civilCode", "manufacture", "model", "owner", "block", "address", "parentId", "ipAddress", "port", "password", "PTZType", "PTZTypeText", "status", "longitude", "latitude", "streamId", "subCount", "parental", "hasAudio", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (84, 1, 'admin', 118, '监控设备', 1, 'admin', '11010200001320000001', '11010200001320000001', 'IPdome', '2024-01-08 22:16:32', '132', '132', '北京市/市辖区/西城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', 0, '', 0, '', 3, 0.000000, 0.000000, 'gb_play_11010200001320000001_11010200001320000001', 0, 0, 0, '0', '', '2023-04-11 21:12:33', '', NULL, NULL);
-INSERT INTO "public"."sip_device_channel" ("id", "tenant_id", "tenant_name", "product_id", "product_name", "user_id", "user_name", "device_sip_id", "channel_sip_id", "channel_name", "register_time", "device_type", "channel_type", "cityCode", "civilCode", "manufacture", "model", "owner", "block", "address", "parentId", "ipAddress", "port", "password", "PTZType", "PTZTypeText", "status", "longitude", "latitude", "streamId", "subCount", "parental", "hasAudio", "del_flag", "create_by", "create_time", "update_by", "update_time", "remark") VALUES (102, 1, 'admin', 135, '视频监控', 0, '', '11010100001320000001', '11010100001320000001', 'IPdome', '2024-01-09 23:35:00', '132', '132', '北京市/市辖区/东城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', 0, '', 0, '', 3, 0.000000, 0.000000, '', 0, 0, 0, '0', '', '2024-01-08 22:15:57', '', NULL, NULL);
+INSERT INTO "public"."sip_device_channel" VALUES (84, 1, 'admin', 118, '监控设备', 1, 'admin', '11010200001320000001', '11010200001320000001', 'IPdome', '2024-01-08 22:16:32', '132', '132', '北京市/市辖区/西城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', 0, '', 0, '', 3, 0.000000, 0.000000, 'gb_play_11010200001320000001_11010200001320000001', 0, 0, 0, '0', '', '2023-04-11 21:12:33', '', NULL, NULL);
+INSERT INTO "public"."sip_device_channel" VALUES (102, 1, 'admin', 135, '视频监控', 0, '', '11010100001320000001', '11010100001320000001', 'IPdome', '2024-01-09 23:35:00', '132', '132', '北京市/市辖区/东城区', '3402000000', 'Hikvision', 'IP Camera', 'Owner', '', 'Address', '34020000002000000001', '', 0, '', 0, '', 3, 0.000000, 0.000000, '', 0, 0, 0, '0', '', '2024-01-08 22:15:57', '', NULL, NULL);
 COMMIT;
 
 -- ----------------------------
@@ -2432,7 +2432,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_auth_user";
 CREATE TABLE "public"."sys_auth_user" (
-  "auth_id" int8 NOT NULL,
+  "auth_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "uuid" varchar(500) NOT NULL,
   "user_id" int8 NOT NULL,
   "login_name" varchar(30) NOT NULL,
@@ -2465,7 +2465,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_config";
 CREATE TABLE "public"."sys_config" (
-  "config_id" int4 NOT NULL,
+  "config_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 7 INCREMENT BY 1),
   "config_name" varchar(100),
   "config_key" varchar(100),
   "config_value" varchar(500),
@@ -2505,7 +2505,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_dept";
 CREATE TABLE "public"."sys_dept" (
-  "dept_id" int8 NOT NULL,
+  "dept_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 110 INCREMENT BY 1),
   "parent_id" int8,
   "ancestors" varchar(50),
   "dept_name" varchar(30),
@@ -2558,7 +2558,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_dict_data";
 CREATE TABLE "public"."sys_dict_data" (
-  "dict_code" int8 NOT NULL,
+  "dict_code" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 778 INCREMENT BY 1),
   "dict_sort" int4,
   "dict_label" varchar(100),
   "dict_value" varchar(100),
@@ -2908,7 +2908,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_dict_type";
 CREATE TABLE "public"."sys_dict_type" (
-  "dict_id" int8 NOT NULL,
+  "dict_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 207 INCREMENT BY 1),
   "dict_name" varchar(100),
   "dict_type" varchar(100),
   "status" char(1),
@@ -2989,7 +2989,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_job";
 CREATE TABLE "public"."sys_job" (
-  "job_id" int8 NOT NULL,
+  "job_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 7 INCREMENT BY 1),
   "job_name" varchar(64) NOT NULL,
   "job_group" varchar(64) NOT NULL,
   "invoke_target" varchar(500) NOT NULL,
@@ -3033,7 +3033,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_job_log";
 CREATE TABLE "public"."sys_job_log" (
-  "job_log_id" int8 NOT NULL,
+  "job_log_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 3 INCREMENT BY 1),
   "job_name" varchar(64) NOT NULL,
   "job_group" varchar(64) NOT NULL,
   "invoke_target" varchar(500) NOT NULL,
@@ -3074,7 +3074,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_logininfor";
 CREATE TABLE "public"."sys_logininfor" (
-  "info_id" int8 NOT NULL,
+  "info_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "user_name" varchar(50),
   "ipaddr" varchar(128),
   "login_location" varchar(255),
@@ -3107,7 +3107,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_menu";
 CREATE TABLE "public"."sys_menu" (
-  "menu_id" int8 NOT NULL,
+  "menu_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 3063 INCREMENT BY 1),
   "menu_name" varchar(50) NOT NULL,
   "parent_id" int8,
   "order_num" int4,
@@ -3316,7 +3316,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_notice";
 CREATE TABLE "public"."sys_notice" (
-  "notice_id" int4 NOT NULL,
+  "notice_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 3 INCREMENT BY 1),
   "notice_title" varchar(50) NOT NULL,
   "notice_type" char(1) NOT NULL,
   "notice_content" bytea,
@@ -3353,7 +3353,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_oper_log";
 CREATE TABLE "public"."sys_oper_log" (
-  "oper_id" int8 NOT NULL,
+  "oper_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1),
   "title" varchar(50),
   "business_type" int4,
   "method" varchar(100),
@@ -3402,7 +3402,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_post";
 CREATE TABLE "public"."sys_post" (
-  "post_id" int8 NOT NULL,
+  "post_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 5 INCREMENT BY 1),
   "post_code" varchar(64) NOT NULL,
   "post_name" varchar(50) NOT NULL,
   "post_sort" int4 NOT NULL,
@@ -3441,7 +3441,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_role";
 CREATE TABLE "public"."sys_role" (
-  "role_id" int8 NOT NULL,
+  "role_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 6 INCREMENT BY 1),
   "role_name" varchar(30) NOT NULL,
   "role_key" varchar(100) NOT NULL,
   "role_sort" int4 NOT NULL,
@@ -3815,7 +3815,7 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS "public"."sys_user";
 CREATE TABLE "public"."sys_user" (
-  "user_id" int8 NOT NULL,
+  "user_id" int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 13 INCREMENT BY 1),
   "dept_id" int8,
   "user_name" varchar(30) NOT NULL,
   "nick_name" varchar(30) NOT NULL,