fix not available pictures uses storage

TeamVastsea · Dec 12, 2023 · 5a58743 · 5a58743
1 parent f8c21ec
commit 5a58743
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/cc/vastsea/toyou/service/impl/PictureServiceImpl.java b/src/main/java/cc/vastsea/toyou/service/impl/PictureServiceImpl.java
@@ -11,6 +11,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.benmanes.caffeine.cache.Cache;
 import jakarta.annotation.Resource;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import net.coobird.thumbnailator.geometry.Position;
@@ -51,6 +52,7 @@ public class PictureServiceImpl extends ServiceImpl<PictureMapper, Picture> impl
 	private PictureMapper pictureMapper;
 
 
+	@Getter
 	private boolean allowSaveToDatabase = true;
 
 	// allowSaveToDatabase 是否允许上传图片写入数据库
@@ -68,10 +70,6 @@ public Cache<String, Picture> getWaitSavePictureCache() {
 		return waitSavePictureCache;
 	}
 
-	public boolean isAllowSaveToDatabase() {
-		return allowSaveToDatabase;
-	}
-
 	@Override
 	public Picture getPicture(String pid) {
 		Picture picture = pictureCache.getIfPresent(pid);

diff --git a/src/main/java/cc/vastsea/toyou/service/impl/UserPictureServiceImpl.java b/src/main/java/cc/vastsea/toyou/service/impl/UserPictureServiceImpl.java
@@ -49,11 +49,13 @@ public long getUsedStorage(long uid) {
 		Set<UserPicture> pictures = getUserPictures(uid);
 		long usedStorage = 0;
 		for (UserPicture picture : pictures) {
-			Picture pictureQuery = new Picture();
-			pictureQuery.setPid(picture.getPid());
-			Picture p = pictureMapper.selectOne(new QueryWrapper<>(pictureQuery));
-			if(p!=null)
+			if (!picture.getAvailable()) {
+				continue;
+			}
+			Picture p = pictureMapper.selectById(picture.getId());
+			if(p!=null) {
 				usedStorage += p.getSize();
+			}
 		}
 		return usedStorage;
 	}