1.调整文件上传 文件类型查询字典

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/HomeController.java

@@ -44,14 +44,14 @@ public class HomeController {
 //    }
 
     @GetMapping("/getFileList")
-    @Operation(summary = "获取后台文件列表", description = "获取后台指定业务类型下所有的文件，包含访问地址，目前后台有三种类型：1.FLOORPLAN-户型图,2.CAROUSEL-轮播图,3.USERPROTOCOL-用户协议")
+    @Operation(summary = "获取后台文件列表", description = "获取oss中数据库存储的url  文件类型根据字典接口查询 oss_busi_type 然后下拉选择")
     public ApiResult<List<OssFileDTO>> getFileList(@RequestParam String fileType) {
         return ApiResult.success(userGateway.getFileList(fileType));
     }
 
 
     @PostMapping(value = "/uploadFile")
-    @Operation(summary = "上传文件", description = "上传通用文件，支持指定文件类型，目前后台有三种类型：1.FLOORPLAN-户型图,2.CAROUSEL-轮播图,3.USERPROTOCOL-用户协议")
+    @Operation(summary = "上传文件", description = "上传通用文件，文件类型根据字典接口查询 oss_busi_type 然后下拉选择 ")
     public ApiResult<Void> uploadCommonFile(@Valid @RequestParam MultipartFile file, 
                                            @RequestParam String fileType) throws IOException {
         userGateway.uploadCommonFile(file, fileType);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -1065,7 +1065,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         String objectName = OssUtils.getObjectName(OssBusiType.FLOORPLAN.getCode(), file.getOriginalFilename());
         ossClient.upload(file.getInputStream(), OssUtils.BUCKET_NAME, objectName);
 
-        TblOssFile ossFile = ossFileService.queryOneFile(OssBusiType.FLOORPLAN.getCode(), groupUuid);
+        TblOssFile ossFile = ossFileService.queryOneFile(OssBusiType.FLOORPLAN.getCode(), groupUuid, objectName);
         if (ossFile == null) {
             TblOssFile newFile = new TblOssFile();
             newFile.setBusiType(OssBusiType.FLOORPLAN.getCode());

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -637,7 +637,7 @@ public class UserGatewayImpl implements UserGateway {
         ossClient.upload(file.getInputStream(), OssUtils.BUCKET_NAME, objectName);
 
         // 查询是否已存在相同文件名和业务类型的记录
-        TblOssFile existingFile = ossFileService.queryOneFile(fileType, "0");
+        TblOssFile existingFile = ossFileService.queryOneFile(fileType, "0", originalFilename);
         if (existingFile != null && originalFilename.equals(existingFile.getFileName())) {
             // 如果存在相同文件名和业务类型的记录，则更新现有记录
             log.info("发现相同文件名和业务类型的记录，执行覆盖操作：文件名={}, 业务类型={}", originalFilename, fileType);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/OssFileService.java

@@ -11,6 +11,6 @@ public interface OssFileService extends IService<TblOssFile> {
     List<TblOssFile> queryFile(String busiType, String busiKey);
 
 
-    TblOssFile queryOneFile(String busiType, String busiKey);
+    TblOssFile queryOneFile(String busiType, String busiKey, String fileName);
 
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/OssFileServiceImpl.java

@@ -1,8 +1,5 @@
 package com.hfln.portal.infrastructure.service.impl;
 
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.ObjectMetadata;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hfln.portal.infrastructure.mapper.TblOssFileMapper;
@@ -11,10 +8,7 @@ import com.hfln.portal.infrastructure.po.TblOssFile;
 import com.hfln.portal.infrastructure.service.OssFileService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
 
@@ -46,13 +40,15 @@ public class OssFileServiceImpl extends ServiceImpl<TblOssFileMapper, TblOssFile
     }
 
     @Override
-    public TblOssFile queryOneFile(String busiType, String busiKey) {
+    public TblOssFile queryOneFile(String busiType, String busiKey, String fileName) {
         LambdaQueryWrapper<TblOssFile> queryWrapper = new LambdaQueryWrapper<TblOssFile>()
-                .select()
                 .eq(TblOssFile::getBusiType, busiType);
         if (Objects.nonNull(busiKey)) {
             queryWrapper.eq(TblOssFile::getBusiKey, busiKey);
         }
+        if (Objects.nonNull(fileName)){
+            queryWrapper.eq(TblOssFile::getFileName, fileName);
+        }
         return this.baseMapper.selectOne(queryWrapper);
     }