From a3c54410de03f0fd242e1a1118d6471300cf1eda Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/basic/StorageBlobMapper.xml | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/basic/StorageBlobMapper.xml b/src/main/resources/mapper/basic/StorageBlobMapper.xml
index 84e3b00..d8a03fa 100644
--- a/src/main/resources/mapper/basic/StorageBlobMapper.xml
+++ b/src/main/resources/mapper/basic/StorageBlobMapper.xml
@@ -2,21 +2,50 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StorageBlobMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageBlob">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="key" property="key" />
- <result column="content_type" property="contentType" />
- <result column="original_filename" property="originalFilename" />
- <result column="bucket_filename" property="bucketFilename" />
- <result column="bucket_name" property="bucketName" />
- <result column="byte_size" property="byteSize" />
- </resultMap>
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageBlob">
+ <id column="id" property="id"/>
+ <result column="resource_key" property="resourceKey"/>
+ <result column="content_type" property="contentType"/>
+ <result column="original_filename" property="originalFilename"/>
+ <result column="uid_filename" property="uidFilename"/>
+ <result column="byte_size" property="byteSize"/>
+ <result column="path" property="path"/>
+ </resultMap>
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, create_time, key, content_type, original_filename,bucket_filename,bucket_name, byte_size
- </sql>
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, resource_key, content_type, original_filename, uid_filename, byte_size, path
+ </sql>
-</mapper>
\ No newline at end of file
+ <select id="selectOrphanBlobsByIdRange" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM storage_blob sb
+ LEFT JOIN storage_attachment sa
+ ON sa.storage_blob_id = sb.id
+ AND sa.deleted = 0
+ WHERE sb.id <![CDATA[>]]> #{lastId}
+ AND sa.id IS NULL
+ ORDER BY sb.id ASC
+ LIMIT #{limit}
+ </select>
+
+ <delete id="deleteByIdList">
+ DELETE FROM storage_blob
+ WHERE id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+ <select id="selectExistingUidFilenames" resultType="java.lang.String">
+ SELECT uid_filename
+ FROM storage_blob
+ WHERE uid_filename IN
+ <foreach collection="fileNames" item="fileName" open="(" separator="," close=")">
+ #{fileName}
+ </foreach>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3