Merge branch 'release/V1.0.0/test' of http://192.168.4.240:3000/LINK/LINK-SERVER into release/V2.0.0/test

 Conflicts:

	src/main/java/com/lqkj/link/config/ThreadPoolConfig.java

	src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

	src/main/java/com/lqkj/link/util/AliOSSUtils.java

	src/main/resources/db/migration/V3__2.0.0.sql

src/main/java/com/lqkj/link/config/ThreadPoolConfig.java

@@ -14,7 +14,10 @@ public class ThreadPoolConfig {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(20); // 核心线程池大小
         executor.setMaxPoolSize(50); // 最大线程池大小
-        executor.setQueueCapacity(150); // 队列容量
+        executor.setQueueCapacity(500); // 队列容量
+        executor.setKeepAliveSeconds(300);
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
         executor.setThreadNamePrefix("Async-"); // 线程名称前缀
         executor.initialize();
         return executor;

src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

@@ -1,11 +1,9 @@
 package com.lqkj.link.module.authority.service;
 
-import cn.hutool.core.util.RandomUtil;
-import com.lqkj.link.module.authority.domain.Captcha;
 import com.lqkj.link.module.authority.domain.UserInfo;
-import com.lqkj.link.module.authority.repository.CaptchaRepository;
 import com.lqkj.link.module.authority.repository.RoleInfoRepository;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
+import com.lqkj.link.util.FileUtils;
 import com.lqkj.link.util.RSAUtils;
 import com.lqkj.link.util.SendSmsUtils;
 import jakarta.annotation.PostConstruct;
@@ -20,6 +18,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -320,4 +319,6 @@ public class UserInfoService {
             throw new RuntimeException(e);
         }
     }
+
+
 }

src/main/java/com/lqkj/link/module/base/service/BaseService.java

@@ -88,4 +88,18 @@ public class BaseService {
             throw new RuntimeException(e);
         }
     }
+
+    public String ossAddModel(MultipartFile file, String s) {
+        String fileName = file.getOriginalFilename();
+        String suffix = fileName == null ? "" : fileName.substring(fileName.lastIndexOf(".") + 1);
+        if (!suffix.equals("obj") && !suffix.equals("fbx") && !suffix.equals("FBX"))
+            throw new RuntimeException("上传文件类型必须是obj、fbx格式的压缩文件");
+        if (aliOSSUtils.ossCheckCapacity(s) + file.getSize() >= 21474836480L)
+            throw new RuntimeException("容量已满，无法上传文件");
+        try {
+            return aliOSSUtils.addModel(file, s);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

src/main/java/com/lqkj/link/module/zone/controller/ResourceController.java

@@ -250,4 +250,45 @@ public class ResourceController {
     public MessageBean<String> ossUpload(MultipartFile file) {
         return MessageBean.ok(baseService.ossUpload(file), "oss上传");
     }
+
+    /**
+     * 检查本地容量
+     * @param request
+     * @return
+     */
+    @GetMapping("/checkCapacity")
+    public MessageBean<String> checkCapacity(HttpServletRequest request){
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        return MessageBean.ok(resourceService.checkCapacity(userCode), "检查容量");
+    }
+
+    @Operation(
+            summary = "个人库模型上传接口",
+            description = "个人库模型上传接口",
+            parameters = {
+                    @Parameter(name = "file", description = "文件", required = true)
+            }
+    )
+    @PostMapping("/oss/addModel")
+    public MessageBean<String> ossAddModel(MultipartFile file,
+                                        HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        Integer userId = userInfoService.detailByUserCode(userCode).getUserId();
+        return MessageBean.ok(baseService.ossAddModel(file, "resource/model/" + userId + "/"), "oss上传");
+    }
+
+
+    /**
+     * 阿里云检查容量
+     * @param request
+     * @return
+     */
+    @GetMapping("/oss/checkCapacity")
+    public MessageBean<String> ossCheckCapacity(HttpServletRequest request){
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        return MessageBean.ok(resourceService.ossCheckCapacity(userCode), "检查容量");
+    }
 }

src/main/java/com/lqkj/link/module/zone/repository/ModelInfoRepository.java

@@ -46,4 +46,5 @@ public interface ModelInfoRepository extends JpaRepository<ModelInfo, Integer> {
     )
     void deleteAllByTemplateIds(@Param("templateIds") List<Integer> templateIds);
 
+    List<ModelInfo> findByCategoryIdIn(List<Integer> categoryId);
 }

src/main/java/com/lqkj/link/module/zone/service/ResourceService.java

@@ -7,6 +7,7 @@ import com.lqkj.link.module.zone.domain.ModelInfo;
 import com.lqkj.link.module.zone.repository.ModelCategoryRepository;
 import com.lqkj.link.module.zone.repository.ModelInfoRepository;
 import com.lqkj.link.util.AliOSSUtils;
+import com.lqkj.link.util.FileUtils;
 import com.lqkj.link.util.Unzipper;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,16 +122,28 @@ public class ResourceService {
     }
 
     public void deleteModel(Integer modelId) {
+        ModelInfo modelInfo = infoRepository.findById(modelId).get();
         infoRepository.deleteById(modelId);
+        aliOSSUtils.deleteModel(modelInfo.getOriginalPath());
     }
 
     @Transactional
     public void deleteCategory(List<Integer> categoryId) {
+        deleteOssFiles(categoryId);
         categoryRepository.deleteAllByIdInBatch(categoryId);
         // 更新用户资源刷新状态
         userInfoRepository.updateRefreshStatus();
     }
 
+    /**
+     * 删除oss文件
+     *
+     * @param categoryId
+     */
+    private void deleteOssFiles(List<Integer> categoryId) {
+        infoRepository.findByCategoryIdIn(categoryId).forEach(modelInfo -> aliOSSUtils.deleteModel(modelInfo.getOriginalPath()));
+    }
+
     public List<Map<String, Object>> resourceCategory(String userCode) {
         return categoryRepository.queryWithUserCode(userCode);
     }
@@ -164,4 +177,28 @@ public class ResourceService {
         UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
         return userInfo.getRefreshResource() != null && userInfo.getRefreshResource();
     }
+
+    /**
+     * 检查本地个人库容量
+     * @param userCode
+     * @return
+     */
+    public String checkCapacity(String userCode) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        String filePath = "./upload/resource/model/" + userInfo.getUserId();
+        File file = new File(filePath);
+        if (!file.exists()) return "0";
+        return "个人库 已使用" + FileUtils.convertBytes(FileUtils.getFolderSize(new File(filePath))) + "/20G";
+    }
+
+    /**
+     * 检查OSS个人库容量
+     * @param userCode
+     * @return
+     */
+    public String ossCheckCapacity(String userCode) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        Long aLong = aliOSSUtils.ossCheckCapacity("resource/model/" + userInfo.getUserId() + "/");
+        return "个人库 已使用" + FileUtils.convertBytes(aLong) + "/20G";
+    }
 }

src/main/java/com/lqkj/link/util/AliOSSUtils.java

@@ -2,6 +2,9 @@ package com.lqkj.link.util;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.ListObjectsV2Request;
+import com.aliyun.oss.model.ListObjectsV2Result;
+import com.aliyun.oss.model.OSSObjectSummary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -13,6 +16,8 @@ import java.io.InputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.LocalDate;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
@@ -38,6 +43,11 @@ public class AliOSSUtils {
         String originalFilename = file.getName();
         String fileName = "file/" + LocalDate.now() + "/" + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
         //上传文件到 OSS
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
         OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
         threadPoolUtil.getTaskExecutor().execute(() -> {
             ossClient.putObject(aliProperties.getBucketName(), fileName, file);
@@ -70,5 +80,70 @@ public class AliOSSUtils {
         }
     }
 
- 
+
+    public String addModel(MultipartFile file, String path) {
+        // 获取上传的文件的输入流
+        try {
+            InputStream inputStream = file.getInputStream();
+            // 避免文件覆盖
+            String originalFilename = file.getOriginalFilename();
+            String fileName = path + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
+            //上传文件到 OSS
+            OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
+            threadPoolUtil.getTaskExecutor().execute(() -> {
+                ossClient.putObject(aliProperties.getBucketName(), fileName, inputStream);
+                ossClient.shutdown();
+            });
+            //文件访问路径
+            return aliProperties.getOsspath().split("//")[0] + "//" + aliProperties.getBucketName() + "." + aliProperties.getOsspath().split("//")[1] + "/" + fileName;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Long ossCheckCapacity(String path) {
+        OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
+        return calculateFolderLength(ossClient, aliProperties.getBucketName(), path);
+    }
+
+    private static long calculateFolderLength(OSS ossClient, String bucketName, String folder) {
+        long size = 0L;
+        ListObjectsV2Result result = null;
+        do {
+            // MaxKey默认值为100，最大值为1000。
+            ListObjectsV2Request request = new ListObjectsV2Request(bucketName).withPrefix(folder).withMaxKeys(1000);
+            if (result != null) {
+                request.setContinuationToken(result.getNextContinuationToken());
+            }
+            result = ossClient.listObjectsV2(request);
+            List<OSSObjectSummary> sums = result.getObjectSummaries();
+            for (OSSObjectSummary s : sums) {
+                size += s.getSize();
+            }
+        } while (result.isTruncated());
+        return size;
+        try {
+            InputStream inputStream = file.getInputStream();
+            // 避免文件覆盖
+            String originalFilename = file.getOriginalFilename();
+            String fileName = "file/" + LocalDate.now() + "/" + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
+            //上传文件到 OSS
+            OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
+            threadPoolUtil.getTaskExecutor().execute(() -> {
+                ossClient.putObject(aliProperties.getBucketName(), fileName, inputStream);
+                ossClient.shutdown();
+            });
+            //文件访问路径
+            return aliProperties.getOsspath().split("//")[0] + "//" + aliProperties.getBucketName() + "." + aliProperties.getOsspath().split("//")[1] + "/" + fileName;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void deleteModel(String path) {
+        OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
+        String prefix = aliProperties.getOsspath().split("//")[0] + "//" + aliProperties.getBucketName() + "." + aliProperties.getOsspath().split("//")[1] + "/";
+        ossClient.deleteObject(aliProperties.getBucketName(), path.replace(prefix, ""));
+    }
+
 }

src/main/java/com/lqkj/link/util/FileUtils.java

@@ -179,4 +179,49 @@ public class FileUtils {
         }
         return result;
     }
+
+    public static long getFolderSize(File folder) {
+        long totalSize = 0;
+
+        // 检查路径是否存在且为目录
+        if (folder.exists() && folder.isDirectory()) {
+            File[] files = folder.listFiles();
+            if (files != null) { // 处理可能为 null 的情况
+                for (File file : files) {
+                    if (file.isFile()) {
+                        // 累加文件大小
+                        totalSize += file.length();
+                    } else if (file.isDirectory()) {
+                        // 递归计算子目录大小
+                        totalSize += getFolderSize(file);
+                    }
+                }
+            }
+        } else {
+            System.out.println("The specified path does not exist or is not a directory.");
+        }
+
+        return totalSize;
+    }
+
+    public static String convertBytes(long bytes) {
+        if (bytes < 0) {
+            return "Invalid size";
+        }
+
+        // 定义单位
+        String[] units = {"B", "KB", "MB", "GB"};
+        int unitIndex = 0;
+
+        // 逐步转换为更大的单位
+        double size = (double) bytes;
+
+        while (unitIndex < units.length - 1) {
+            size /= 1024;
+            unitIndex++;
+        }
+
+        // 使用 String.format 格式化输出
+        return String.format("%.2f%s", size, units[unitIndex]);
+    }
 }

src/main/resources/db/migration/V3__2.0.0.sql

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 alter table zone_info add column like_count INT4 default 0;
 comment on column zone_info.like_count is
 '点赞数: like_count';
@@ -17,4 +18,24 @@ comment on column Likes.user_id is
 comment on column Likes.zone_id is
 '点赞的作品id: zone_id';
 comment on column Likes.create_time is
-'点赞时间: create_time'
+'点赞时间: create_time'
+=======
+alter table geom_info
+    add column if not exists pics varchar(1024),
+    add column if not exists video_url varchar(1024),
+    add column if not exists audio_url varchar(1024),
+    add column if not exists brief text,
+    add column if not exists navigation bool default false,
+    add column if not exists navigation_end varchar(100);
+
+comment on column geom_info.pics is '图片地址：pics';
+comment on column geom_info.video_url is '视频文件地址：video_url';
+comment on column geom_info.audio_url is '音频文件地址：audio_url';
+comment on column geom_info.brief is '简介：brief';
+comment on column geom_info.navigation is '是否导航：navigation';
+comment on column geom_info.navigation_end is '导航终点：navigation_end';
+
+
+ALTER TABLE model_info
+ALTER COLUMN texture_path TYPE VARCHAR(5000);
+>>>>>>> 2ea1012e32fc18bb55a79461c9862f040d41294a