Переглянути джерело

更新 oss-mgr 中 mapper 的表名

reghao 6 днів тому
батько
коміт
629a97fee1

+ 9 - 9
oss-mgr/src/main/resources/mapper/DataBlockMapper.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.DataBlockMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into data_block
+        insert into oss_data_block
         (`sha256sum`,`host_port`,`absolute_path`,`size`)
         values
         (#{sha256sum},#{hostPort},#{absolutePath},#{size})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into data_block
+        insert into oss_data_block
         (`sha256sum`,`host_port`,`absolute_path`,`size`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -18,43 +18,43 @@
     </insert>
 
     <delete id="deleteBySha256sum">
-        delete from data_block
+        delete from oss_data_block
         where sha256sum=#{sha256sum}
     </delete>
 
     <update id="updatePath">
-        update data_block
+        update oss_data_block
         set absolute_path=#{path}
         where sha256sum=#{sha256sum}
     </update>
     <update id="updateDataBlock">
-        update data_block
+        update oss_data_block
         set absolute_path=#{path}, host_port=#{hostPort}
         where id=#{id}
     </update>
 
     <select id="findAll" resultType="cn.reghao.oss.mgr.model.po.DataBlock">
         select *
-        from data_block
+        from oss_data_block
         where absolute_path like '/opt/disk/13%'
         order by `size`  desc
         limit 10000
     </select>
     <select id="findBySha256sum" resultType="cn.reghao.oss.mgr.model.po.DataBlock">
         select *
-        from data_block
+        from oss_data_block
         where deleted is false and sha256sum=#{sha256sum}
     </select>
     <select id="findByObjectId" resultType="cn.reghao.oss.mgr.model.po.DataBlock">
         select datablock.*
-        from data_block datablock
+        from oss_data_block datablock
         inner join file_meta filemeta
         on filemeta.sha256sum=datablock.sha256sum
         where filemeta.`deleted` is false and filemeta.object_id=#{objectId}
     </select>
     <select id="findAllById" resultType="cn.reghao.oss.mgr.model.po.DataBlock">
         select *
-        from data_block
+        from oss_data_block
         where id > #{nextId}
         order by id asc
         limit #{pageSize}

+ 24 - 24
oss-mgr/src/main/resources/mapper/FileMetaMapper.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.FileMetaMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_meta
+        insert into oss_file_meta
         (`object_name`,`object_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`,`active`)
         values
         (#{objectName},#{objectId},#{pid},#{filename},#{size},#{fileType},#{contentType},#{sha256sum},#{uploadBy},#{scope},#{active})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into file_meta
+        insert into oss_file_meta
         (`object_name`,`object_id`,`pid`,`filename`,`size`,`file_type`,`content_type`,`sha256sum`,`upload_by`,`scope`,`active`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -18,95 +18,95 @@
     </insert>
 
     <delete id="deleteByObjectId">
-        delete from file_meta
+        delete from oss_file_meta
         where object_id=#{objectId}
     </delete>
 
     <update id="updateSha256sum">
-        update file_meta
+        update oss_file_meta
         set update_time=now(),sha256sum=#{sha256sum}
         where object_id=#{objectId}
     </update>
     <update id="updateScopeByObjectName">
-        update file_meta
+        update oss_file_meta
         set update_time=now(),scope=#{scope}
         where object_name=#{objectName}
     </update>
     <update id="updateScopeByObjectId">
-        update file_meta
+        update oss_file_meta
         set update_time=now(),scope=#{scope}
         where object_id=#{objectId}
     </update>
     <update id="updateSetActiveByObjectId">
-        update file_meta
+        update oss_file_meta
         set update_time=now(),active=1
         where object_id=#{objectId}
     </update>
     <update id="updateSetDeleteByObjectId">
-        update file_meta
+        update oss_file_meta
         set update_time=now(),deleted=1
         where object_id=#{objectId}
     </update>
 
     <select id="findAll" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta fm
+        from oss_file_meta fm
         where fm.object_name like 'video/cam/%'
     </select>
     <select id="findAllByDeleted" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where `deleted` is true
         limit 1000
     </select>
     <select id="findAllByInactive" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where `active` is false
         limit 1000
     </select>
     <select id="findBySha256sum" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where sha256sum=#{sha256sum}
         order by id asc
         limit 10
     </select>
     <select id="findByObjectId" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where deleted is false and object_id=#{objectId}
         limit 1
     </select>
     <select id="findByObjectName" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where deleted is false and object_name=#{objectName}
     </select>
     <select id="findObjectMetaByName" resultType="cn.reghao.oss.api.dto.ObjectMeta">
-        select file_meta.size,file_meta.content_type,file_meta.filename,file_meta.object_name,file_meta.object_id,file_meta.scope as scope,file_meta.upload_by,
+        select oss_file_meta.size,oss_file_meta.content_type,oss_file_meta.filename,oss_file_meta.object_name,oss_file_meta.object_id,oss_file_meta.scope as scope,oss_file_meta.upload_by,
         data_block.absolute_path
-        from file_meta
+        from oss_file_meta
         inner join data_block
-        on file_meta.deleted is false and file_meta.upload_by=#{owner} and file_meta.sha256sum=data_block.sha256sum
-        and file_meta.object_name=#{objectName}
+        on oss_file_meta.deleted is false and oss_file_meta.upload_by=#{owner} and oss_file_meta.sha256sum=data_block.sha256sum
+        and oss_file_meta.object_name=#{objectName}
     </select>
     <select id="findObjectMetaById" resultType="cn.reghao.oss.api.dto.ObjectMeta">
-        select file_meta.size,file_meta.content_type,file_meta.filename,file_meta.object_name,file_meta.object_id,file_meta.scope as scope,file_meta.upload_by,
+        select oss_file_meta.size,oss_file_meta.content_type,oss_file_meta.filename,oss_file_meta.object_name,oss_file_meta.object_id,oss_file_meta.scope as scope,oss_file_meta.upload_by,
         data_block.absolute_path
-        from file_meta
+        from oss_file_meta
         inner join data_block
-        on file_meta.deleted is false and file_meta.upload_by=#{owner} and file_meta.sha256sum=data_block.sha256sum
-        and file_meta.object_id=#{objectId}
+        on oss_file_meta.deleted is false and oss_file_meta.upload_by=#{owner} and oss_file_meta.sha256sum=data_block.sha256sum
+        and oss_file_meta.object_id=#{objectId}
     </select>
     <select id="findObjectInfoById" resultType="cn.reghao.oss.api.dto.ObjectInfo">
         select *
-        from file_meta
+        from oss_file_meta
         where deleted is false and object_id=#{objectId}
     </select>
     <select id="findBySha256List" resultType="cn.reghao.oss.mgr.model.po.FileMeta">
         select *
-        from file_meta
+        from oss_file_meta
         where sha256sum in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}

+ 6 - 12
oss-mgr/src/main/resources/mapper/StoreNodeMapper.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.StoreNodeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_store_node
+        insert into oss_store_node
         (`node_addr`,`http_port`,`rpc_port`,`enabled`)
         values
         (#{nodeAddr},#{httpPort},#{rpcPort},#{enabled})
@@ -11,33 +11,27 @@
 
     <select id="findAll" resultType="cn.reghao.oss.mgr.model.po.StoreNode">
         select *
-        from file_store_node
+        from oss_store_node
         limit 1000
     </select>
     <select id="findFirstStore" resultType="cn.reghao.oss.mgr.model.po.StoreNode">
         select *
-        from file_store_node
+        from oss_store_node
         limit 1
     </select>
     <select id="findByNodeAddrAndHttpPort" resultType="cn.reghao.oss.mgr.model.po.StoreNode">
         select *
-        from file_store_node
+        from oss_store_node
         where node_addr=#{nodeAddr} and http_port=#{httpPort}
     </select>
     <select id="findById" resultType="cn.reghao.oss.mgr.model.po.StoreNode">
         select *
-        from file_store_node
+        from oss_store_node
         where id=#{id}
     </select>
-    <resultMap id="imageAlbumCard" type="cn.reghao.oss.mgr.model.po.StoreNode">
-        <result property="userId" column="user_id"/>
-        <result property="albumId" column="album_id"/>
-        <result property="albumName" column="album_name"/>
-        <collection property="imageFiles" column="album_id" ofType="cn.reghao.oss.mgr.model.po.StoreVolume" select="findStoreVolumes"/>
-    </resultMap>
     <select id="findStoreVolumes" resultType="cn.reghao.oss.mgr.model.po.StoreVolume">
         select *
-        from file_store_volume
+        from oss_store_volume
         where store_node_id=#{storeNodeId}
     </select>
 </mapper>

+ 3 - 3
oss-mgr/src/main/resources/mapper/StoreVolumeMapper.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.StoreVolumeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_store_volume
+        insert into oss_store_volume
         (`store_node_id`,`name`,`volume`,`mount_point`,`fs_type`,`block_id`,`total_space`,`avail_space`,`total_inode`,`avail_inode`,`store_dir`)
         values
         (#{storeNodeId},#{name},#{volume},#{mountPoint},#{fsType},#{blockId},#{totalSpace},#{availSpace},#{totalInode},#{availInode},#{storeDir})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into file_store_volume
+        insert into oss_store_volume
         (`store_node_id`,`name`,`volume`,`mount_point`,`fs_type`,`block_id`,`total_space`,`avail_space`,`total_inode`,`avail_inode`,`store_dir`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -19,7 +19,7 @@
 
     <select id="findByStoreNodeId" resultType="cn.reghao.oss.mgr.model.po.StoreVolume">
         select *
-        from file_store_volume
+        from oss_store_volume
         where store_node_id=#{storeNodeId}
     </select>
 </mapper>

+ 10 - 10
oss-mgr/src/main/resources/mapper/UploadChannelMapper.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.UploadChannelMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_upload_channel
+        insert into oss_upload_channel
         (`channel_code`,`name`,`prefix`,`max_size`,`file_type`,`set_url`,`set_callback`,`scope`,`enabled`,`user_node_id`,`create_by`)
         values
         (#{channelCode},#{name},#{prefix},#{maxSize},#{fileType},#{setUrl},#{setCallback},#{scope},#{enabled},#{userNodeId},#{createBy})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into file_upload_channel
+        insert into oss_upload_channel
         (`channel_code`,`name`,`prefix`,`max_size`,`file_type`,`set_url`,`set_callback`,`scope`,`enabled`,`user_node_id`,`create_by`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -18,43 +18,43 @@
     </insert>
 
     <delete id="deleteById">
-        delete from file_upload_channel
+        delete from oss_upload_channel
         where id=#{id}
     </delete>
 
     <select id="countByCreateBy" resultType="java.lang.Integer">
         select count(*)
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy}
     </select>
     <select id="findByCreateBy" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy}
     </select>
     <select id="findById" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where id=#{id}
     </select>
     <select id="findByCreateByAndUserNodeId" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy} and user_node_id=#{userNodeId}
     </select>
     <select id="findByCreateByAndChannelCode" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy} and channel_code=#{channelCode}
     </select>
     <select id="findByCreateByAndPrefix" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy} and prefix like concat(#{prefix},'%')
     </select>
     <select id="findByCreateByAndName" resultType="cn.reghao.oss.mgr.model.po.UploadChannel">
         select *
-        from file_upload_channel
+        from oss_upload_channel
         where create_by=#{createBy} and name=#{name}
     </select>
 </mapper>

+ 8 - 8
oss-mgr/src/main/resources/mapper/UploadTaskMapper.xml

@@ -3,43 +3,43 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.UploadTaskMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into upload_task
+        insert into oss_upload_task
         (`upload_id`,`sha256sum`,`offset`,`length`,`split_size`,`filename`,`file_size`,`status`,`expire_time`,`channel_code`,`upload_by`,`host`,`http_port`)
         values
         (#{uploadId},#{sha256sum},#{offset},#{length},#{splitSize},#{filename},#{fileSize},#{status},#{expireTime},#{channelCode},#{uploadBy},#{host},#{httpPort})
     </insert>
 
     <update id="updateTask">
-        update upload_task
+        update oss_upload_task
         set update_time=now(),`status`=#{status},`host`=#{host},`http_port`=#{httpPort}
         where upload_id=#{uploadId}
     </update>
     <update id="updateStatus">
-        update upload_task
+        update oss_upload_task
         set update_time=now(),`status`=#{status}
         where upload_id=#{uploadId}
     </update>
 
     <delete id="deleteByUploadId">
-        delete from upload_task
+        delete from oss_upload_task
         where upload_id=#{uploadId}
     </delete>
 
     <select id="findByUploadId" resultType="cn.reghao.oss.mgr.model.po.UploadTask">
         select *
-        from upload_task
+        from oss_upload_task
         where upload_id=#{uploadId}
     </select>
     <select id="findByExpired" resultType="cn.reghao.oss.mgr.model.po.UploadTask">
         select *
-        from upload_task
+        from oss_upload_task
         where expire_time &lt; now()
         LIMIT 100
     </select>
 
     <select id="countByQuery" resultType="java.lang.Integer">
         select count(*)
-        from upload_task
+        from oss_upload_task
         <where>
             deleted=0
             <if test="status != null">
@@ -49,7 +49,7 @@
     </select>
     <select id="findQueryByPage" resultType="cn.reghao.oss.mgr.model.po.UploadTask">
         select *
-        from upload_task
+        from oss_upload_task
         <where>
             deleted=0
             <if test="uploadTaskQuery.status != null">

+ 4 - 4
oss-mgr/src/main/resources/mapper/UserKeyMapper.xml

@@ -3,26 +3,26 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.UserKeyMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_user_key
+        insert into oss_user_key
         (`access_key_id`,`access_key_secret`,`create_by`)
         values
         (#{accessKeyId},#{accessKeySecret},#{createBy})
     </insert>
 
     <update id="updateByCreateBy">
-        update file_user_key
+        update oss_user_key
         set access_key_id=#{accessKeyId},access_key_secret=#{accessKeySecret}
         where create_by=#{createBy}
     </update>
 
     <select id="findByCreateBy" resultType="cn.reghao.oss.mgr.model.po.UserKey">
         select *
-        from file_user_key
+        from oss_user_key
         where create_by=#{createBy}
     </select>
     <select id="findByAccessKeyId" resultType="cn.reghao.oss.mgr.model.po.UserKey">
         select *
-        from file_user_key
+        from oss_user_key
         where access_key_id=#{accessKeyId}
     </select>
 </mapper>

+ 9 - 9
oss-mgr/src/main/resources/mapper/UserNodeMapper.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="cn.reghao.oss.mgr.db.mapper.UserNodeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into file_user_node
+        insert into oss_user_node
         (`store_node_id`,`domain`,`protocol`,`referer`,`secret_key`,`create_by`)
         values
         (#{storeNodeId},#{domain},#{protocol},#{referer},#{secretKey},#{createBy})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into file_user_node
+        insert into oss_user_node
         (`store_node_id`,`domain`,`protocol`,`referer`,`secret_key`,`create_by`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
@@ -18,38 +18,38 @@
     </insert>
 
     <update id="updateUserNode">
-        update file_user_node
+        update oss_user_node
         set update_time=now(),`domain`=#{domain},`protocol`=#{protocol},`referer`=#{referer},`secret_key`=#{secretKey}
         where id=#{userNodeId}
     </update>
 
     <select id="findAll" resultType="cn.reghao.oss.mgr.model.po.UserNode">
         select *
-        from file_user_node
+        from oss_user_node
     </select>
     <select id="countByStoreNodeId" resultType="java.lang.Integer">
         select *
-        from file_user_node
+        from oss_user_node
         where create_by=#{createBy}
     </select>
     <select id="findByCreateByAndStoreNodeId" resultType="cn.reghao.oss.mgr.model.po.UserNode">
         select *
-        from file_user_node
+        from oss_user_node
         where create_by=#{createBy} and store_node_id=#{storeNodeId}
     </select>
     <select id="findByCreateBy" resultType="cn.reghao.oss.mgr.model.po.UserNode">
         select *
-        from file_user_node
+        from oss_user_node
         where create_by=#{create_by}
     </select>
     <select id="findByDomain" resultType="cn.reghao.oss.mgr.model.po.UserNode">
         select *
-        from file_user_node
+        from oss_user_node
         where domain=#{domain}
     </select>
     <select id="findById" resultType="cn.reghao.oss.mgr.model.po.UserNode">
         select *
-        from file_user_node
+        from oss_user_node
         where id=#{id}
     </select>
 </mapper>