文件后端接口

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

@@ -37,9 +37,8 @@ public class FileUploadController {
     @PermitAll
     @TenantIgnore
     public CommonResult<Map<String, Object>> uploadFiles(
-            @RequestParam("files") MultipartFile[] files,
-            @RequestParam(value = "isFolder", defaultValue = "false") boolean isFolder,
-            HttpServletRequest request) {
+            @RequestParam("files") MultipartFile[] files, @RequestParam(value = "isFolder", defaultValue = "false") boolean isFolder,
+            @RequestHeader("device-id") String deviceId, HttpServletRequest request) {
 
         // 创建根目录（如果不存在）
         File rootDir = new File(uploadPath);
@@ -77,7 +76,7 @@ public class FileUploadController {
                 // 记录文件信息
                 Map<String, Object> fileInfo = new HashMap<>();
                 fileInfo.put("name", FileUtil.getName(originalFilename));
-                String filePaths = fileService.createFile(FileUtil.getName(originalFilename), originalFilename, IoUtil.readBytes(file.getInputStream()));
+                String filePaths = fileService.createFile(FileUtil.getName(originalFilename), deviceId+File.separator+originalFilename, IoUtil.readBytes(file.getInputStream()));
 
                 fileInfo.put("path", originalFilename);
                 fileInfo.put("filePath", filePaths);
@@ -94,7 +93,6 @@ public class FileUploadController {
             result.put("folderStructure", folderStructure);
             result.put("message", "上传成功");
 
-            System.out.println("------------------"+ JSON.toJSONString(result));
             return CommonResult.success(result);
 
         } catch (IOException e) {

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

@@ -193,6 +193,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
                 maintainMaterial.getMaterials().forEach(e ->{
                     IotMaintainMaterialsDO iotMaintainMaterialsDO = new IotMaintainMaterialsDO();
                     BeanUtils.copyProperties(e, iotMaintainMaterialsDO);
+                    iotMaintainMaterialsDO.setId(null);
                     iotMaintainMaterialsDO.setDeleted(false);
                     iotMaintainMaterialsDO.setMaintainId(iotMaintain.getId());
                     iotMaintainMaterialsDO.setBomId(iotMaintainBomDO.getId());