Merge remote-tracking branch 'origin/master'

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
  * @author 芋道源码
  */
 public interface GlobalErrorCodeConstants {
-
+    ErrorCode FILE_SIZE_ERROR = new ErrorCode(126,"获取文件大小错误");
     ErrorCode SUCCESS = new ErrorCode(0, "成功");
 
     // ========== 客户端错误段 ==========

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java

@@ -7,10 +7,15 @@ import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import lombok.SneakyThrows;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.Date;
 
 /**
@@ -78,10 +83,37 @@ public class FileUtils {
         if (StrUtil.isNotBlank(originalName)) {
             String extName = FileNameUtil.extName(originalName);
             //return StrUtil.isBlank(extName) ? sha256Hex : sha256Hex + "." + extName;
-            return StrUtil.isBlank(extName) ? sha256Hex : DateUtil.format(new Date(), "yyyyMMDDHHmmss")+originalName;
+            return StrUtil.isBlank(extName) ? sha256Hex : originalName;
         }
         // 情况二：基于 content 计算
         return sha256Hex + '.' + FileTypeUtil.getType(new ByteArrayInputStream(content));
     }
 
+    public static long getFileSizeMB(String fileUrl){
+        try {
+            URL url = new URL(fileUrl);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("HEAD");
+            conn.setRequestProperty("Accept-Encoding", "identity"); // 禁用压缩
+
+            // 尝试解析Content-Length头
+            String contentLength = conn.getHeaderField("Content-Length");
+            if (contentLength != null) {
+                return Long.parseLong(contentLength);
+            }
+
+            // 处理分块传输或未知大小
+            if ("chunked".equalsIgnoreCase(conn.getHeaderField("Transfer-Encoding"))) {
+                System.out.println("分块传输编码，无法直接获取大小");
+                return -1;
+            }
+
+            conn.disconnect();
+            return -1; // 其他未知情况
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.*;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,6 +26,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import java.util.Map;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
 
@@ -40,10 +43,11 @@ public class FileController {
 
     @PostMapping("/upload")
     @Operation(summary = "上传文件", description = "模式一：后端上传文件")
-    public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
+    public CommonResult<Map> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
         MultipartFile file = uploadReqVO.getFile();
+        long size = file.getSize();
         String path = uploadReqVO.getPath();
-        return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
+        return success(ImmutableMap.of("path",fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())),"size",size));
     }
 
     @GetMapping("/presigned-url")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotInfoSaveReqVO.java

@@ -33,7 +33,7 @@ public class IotInfoSaveReqVO {
     private String fileType;
 
     @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "文件路径不能为空")
+//    @NotEmpty(message = "文件路径不能为空")
     private String filePath;
 
     @Schema(description = "文件大小")
@@ -42,4 +42,6 @@ public class IotInfoSaveReqVO {
     @Schema(description = "备注", example = "随便")
     private String remark;
 
+    @Schema(description = "文件列表")
+    private List<Map<String, String>> fileList;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotInfoServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pms.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.util.io.FileUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotInfoPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotInfoSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotInfoClassifyDO;
@@ -16,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,14 +50,16 @@ public class IotInfoServiceImpl implements IotInfoService {
     @Override
     public void createIotInfo(IotInfoSaveReqVO createReqVO) {
         // 插入
-        if (StringUtils.isBlank(createReqVO.getFilePath())) {
+        if (CollUtil.isEmpty(createReqVO.getFileList())) {
             throw exception(IOT_INFO_NOT_EXISTS);
         }
-        List<IotInfoDO> collect = Arrays.stream(createReqVO.getFilePath().split(",")).map(path -> {
+        List<IotInfoDO> collect = createReqVO.getFileList().stream().map(e -> {
             IotInfoDO iotInfo = BeanUtils.toBean(createReqVO, IotInfoDO.class);
-            // todo iotInfo.setFilename(StringUtils.substringAfterLast(path, File.separator));
-            iotInfo.setFilename(StringUtils.substringAfterLast(path, "/"));
-            iotInfo.setFilePath(path);
+            iotInfo.setFilename(StringUtils.substringAfterLast(e.get("url"), "/"));
+            iotInfo.setFilePath(e.get("url"));
+            long size = Long.parseLong(e.get("size"));
+            double mb = size / (1024.0 * 1024.0);
+            iotInfo.setFileSize(String.format("%.2f MB", mb));
             iotInfo.setDeleted(false);
             return iotInfo;
         }).collect(Collectors.toList());
@@ -69,6 +74,8 @@ public class IotInfoServiceImpl implements IotInfoService {
         // 更新
         IotInfoDO updateObj = BeanUtils.toBean(updateReqVO, IotInfoDO.class);
         updateObj.setFilename(StringUtils.substringAfterLast(updateObj.getFilePath(), "/"));
+        updateObj.setFilePath(updateReqVO.getFilePath());
+        updateObj.setFileSize(String.valueOf(FileUtils.getFileSizeMB(updateReqVO.getFilePath())));
         iotInfoMapper.updateById(updateObj);
     }