检测录入附件上传

build-uat/update.sql

@@ -1656,4 +1656,21 @@ COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_FILE"."ORDER_ITEM_ID" IS '检验设备
 COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_FILE"."EQUIP_MAIN_TYPE" IS '设备类型 200锅炉 300管道';
 COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_FILE"."FILE_NAME" IS '文件名称';
 
+--已加
+
+--20260623
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT" ADD COLUMN "IMAGE_NAME" TEXT;
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT" ADD COLUMN "VIDEO_NAME" TEXT;
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT" ADD COLUMN "ATTACHMENT_NAME" TEXT;
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT"."IMAGE_NAME" IS '附件图片名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT"."VIDEO_NAME" IS '附件视频名称';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT"."ATTACHMENT_NAME" IS '附件文件名称';
+
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT" ADD COLUMN "IMAGE_NAME" TEXT;
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT" ADD COLUMN "VIDEO_NAME" TEXT;
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT" ADD COLUMN "ATTACHMENT_NAME" TEXT;
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."IMAGE_NAME" IS '附件图片名称';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."VIDEO_NAME" IS '附件视频名称';
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."ATTACHMENT_NAME" IS '附件文件名称';
+
 --已加

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemReportVO.java

@@ -125,6 +125,15 @@ public class    BoilerOrderItemReportVO {
     @Schema(description = "附件")
     private String attachment;
 
+    @Schema(description = "图片名称")
+    private String imageName;
+
+    @Schema(description = "视频名称")
+    private String videoName;
+
+    @Schema(description = "附件名称")
+    private String attachmentName;
+
     @Schema(description = "推送人phone")
     private String pushPhone;
     @Schema(description = "推送人")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderArchiveDetailRespVO.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo;
 
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderArchiveDetailRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -24,8 +25,14 @@ public class BoilerTaskOrderArchiveDetailRespVO implements Serializable {
     @Schema(description = "项目文件")
     private List<ItemFile> itemFiles;
 
-    @Schema(description = "附件文件")
-    private List<AttachmentFile> attachmentFiles;
+    @Schema(description = "图片附件列表")
+    private List<AttachmentFile> images;
+
+    @Schema(description = "视频附件列表")
+    private List<AttachmentFile> videos;
+
+    @Schema(description = "文档附件列表")
+    private List<AttachmentFile> attachments;
 
     @Schema(description = "任务单号")
     private String orderNo;
@@ -147,17 +154,11 @@ public class BoilerTaskOrderArchiveDetailRespVO implements Serializable {
         @Serial
         private static final long serialVersionUID = 1L;
 
-        @Schema(description = "附件记录ID", example = "6948")
-        private String id;
-
-        @Schema(description = "文件名称", example = "检验报告附件.pdf")
-        private String fileName;
-
-        @Schema(description = "文件路径", example = "/path/to/file.pdf")
-        private String fileUrl;
+        @Schema(description = "文件URL")
+        private String url;
 
-        @Schema(description = "上传时间", example = "2025-01-01 12:00:00")
-        private LocalDateTime createTime;
+        @Schema(description = "原始文件名称")
+        private String name;
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/ReportUploadItemVO.java

@@ -13,8 +13,14 @@ public class ReportUploadItemVO {
 
     private String image;
 
+    private String imageName;
+
     private String video;
 
+    private String videoName;
+
     private String attachment;
 
+    private String attachmentName;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemReportVO.java

@@ -124,6 +124,15 @@ public class PipeOrderItemReportVO {
     @Schema(description = "附件")
     private String attachment;
 
+    @Schema(description = "图片名称")
+    private String imageName;
+
+    @Schema(description = "视频名称")
+    private String videoName;
+
+    @Schema(description = "附件名称")
+    private String attachmentName;
+
     @Schema(description = "推送人phone")
     private String pushPhone;
     @Schema(description = "推送人")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderArchiveDetailRespVO.java

@@ -24,8 +24,14 @@ public class PipeTaskOrderArchiveDetailRespVO implements Serializable {
     @Schema(description = "项目文件")
     private List<ItemFile> itemFiles;
 
-    @Schema(description = "附件文件")
-    private List<AttachmentFile> attachmentFiles;
+    @Schema(description = "图片附件列表")
+    private List<AttachmentFile> images;
+
+    @Schema(description = "视频附件列表")
+    private List<AttachmentFile> videos;
+
+    @Schema(description = "文档附件列表")
+    private List<AttachmentFile> attachments;
 
     @Schema(description = "任务单号")
     private String orderNo;
@@ -150,17 +156,11 @@ public class PipeTaskOrderArchiveDetailRespVO implements Serializable {
         @Serial
         private static final long serialVersionUID = 1L;
 
-        @Schema(description = "附件记录ID", example = "6948")
-        private String id;
-
-        @Schema(description = "文件名称", example = "检验报告附件.pdf")
-        private String fileName;
-
-        @Schema(description = "文件路径", example = "/path/to/file.pdf")
-        private String fileUrl;
+        @Schema(description = "文件URL")
+        private String url;
 
-        @Schema(description = "上传时间", example = "2025-01-01 12:00:00")
-        private LocalDateTime createTime;
+        @Schema(description = "原始文件名称")
+        private String name;
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/taskorderfile/TaskOrderFileController.java

@@ -28,7 +28,6 @@ import static cn.start.tz.framework.apilog.core.enums.OperateTypeEnum.*;
 import cn.start.tz.module.pressure2.controller.admin.taskorderfile.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.taskorderfile.TaskOrderFileDO;
 import cn.start.tz.module.pressure2.service.taskorderfile.TaskOrderFileService;
-import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "管理后台 - 任务单附件")
 @RestController
@@ -39,17 +38,6 @@ public class TaskOrderFileController {
     @Resource
     private TaskOrderFileService taskOrderFileService;
 
-    @PostMapping("/upload-and-create")
-    @Operation(summary = "上传文件并创建任务单附件")
-    public CommonResult<TaskOrderFileRespVO> uploadAndCreate(
-            @RequestParam("file") MultipartFile file,
-            @RequestParam("orderId") String orderId,
-            @RequestParam("orderItemId") String orderItemId,
-            @RequestParam("equipMainType") Integer equipMainType) {
-        TaskOrderFileDO taskOrderFile = taskOrderFileService.uploadAndCreate(file, orderId, orderItemId, equipMainType);
-        return success(BeanUtils.toBean(taskOrderFile, TaskOrderFileRespVO.class));
-    }
-
     @PostMapping("/create")
     @Operation(summary = "创建任务单附件")
     public CommonResult<String> createTaskOrderFile(@Valid @RequestBody TaskOrderFileSaveReqVO createReqVO) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorderitemreport/BoilerTaskOrderItemReportDO.java

@@ -300,14 +300,26 @@ public class BoilerTaskOrderItemReportDO extends BaseDO {
      * 图片
      */
     private String image;
+    /**
+     * 图片名称
+     */
+    private String imageName;
     /**
      * 视频
      */
     private String video;
+    /**
+     * 视频名称
+     */
+    private String videoName;
     /**
      * 附件
      */
     private String attachment;
+    /**
+     * 附件名称
+     */
+    private String attachmentName;
     /**
      * 仪器仪表id
      */

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderitemreport/PipeTaskOrderItemReportDO.java

@@ -297,14 +297,26 @@ public class PipeTaskOrderItemReportDO extends BaseDO {
      * 图片
      */
     private String image;
+    /**
+     * 图片名称
+     */
+    private String imageName;
     /**
      * 视频
      */
     private String video;
+    /**
+     * 视频名称
+     */
+    private String videoName;
     /**
      * 附件
      */
     private String attachment;
+    /**
+     * 附件名称
+     */
+    private String attachmentName;
     /**
      * 仪器仪表id
      */

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -95,7 +95,7 @@ import cn.start.tz.module.pressure2.service.membermessage.MemberMessageRemoteSer
 import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
-import cn.start.tz.module.pressure2.service.taskorderfile.TaskOrderFileService;
+
 import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
@@ -305,9 +305,6 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private FileApi fileApi;
 
-    @Resource
-    private TaskOrderFileService taskOrderFileService;
-
     @Resource
     private PushTaskOrderService pushTaskOrderService;
 
@@ -2514,24 +2511,48 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 }
             }
         }
-        // 查询附件文件
-        TaskOrderFilePageReqVO filePageReqVO = new TaskOrderFilePageReqVO();
-        filePageReqVO.setOrderItemId(orderItemId);
-        filePageReqVO.setPageSize(Integer.MAX_VALUE);
-        PageResult<TaskOrderFileDO> filePageResult =
-                taskOrderFileService.getTaskOrderFilePage(filePageReqVO);
-        if (CollUtil.isNotEmpty(filePageResult.getList())) {
-            List<BoilerTaskOrderArchiveDetailRespVO.AttachmentFile> attachmentFiles = new ArrayList<>();
-            for (TaskOrderFileDO fileDO : filePageResult.getList()) {
-                BoilerTaskOrderArchiveDetailRespVO.AttachmentFile attachmentFile = new BoilerTaskOrderArchiveDetailRespVO.AttachmentFile();
-                attachmentFile.setId(fileDO.getId());
-                attachmentFile.setFileName(fileDO.getFileName());
-                attachmentFile.setFileUrl(fileDO.getFileUrl());
-                attachmentFile.setCreateTime(fileDO.getCreateTime());
-                attachmentFiles.add(attachmentFile);
-            }
-            taskOrderArchiveDetail.setAttachmentFiles(attachmentFiles);
+        // 收集附件文件（image/video/attachment）
+        List<BoilerTaskOrderArchiveDetailRespVO.AttachmentFile> allImages = new ArrayList<>();
+        List<BoilerTaskOrderArchiveDetailRespVO.AttachmentFile> allVideos = new ArrayList<>();
+        List<BoilerTaskOrderArchiveDetailRespVO.AttachmentFile> allAttachments = new ArrayList<>();
+        for (BoilerTaskOrderItemReportDO reportDO : taskOrderItemReportDOS) {
+            String[] imageUrls = reportDO.getImage() != null ? reportDO.getImage().split(",") : new String[0];
+            String[] imageNames = reportDO.getImageName() != null ? reportDO.getImageName().split(",") : new String[0];
+            for (int i = 0; i < imageUrls.length; i++) {
+                String url = imageUrls[i].trim();
+                if (!url.isEmpty()) {
+                    BoilerTaskOrderArchiveDetailRespVO.AttachmentFile af = new BoilerTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < imageNames.length ? imageNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allImages.add(af);
+                }
+            }
+            String[] videoUrls = reportDO.getVideo() != null ? reportDO.getVideo().split(",") : new String[0];
+            String[] videoNames = reportDO.getVideoName() != null ? reportDO.getVideoName().split(",") : new String[0];
+            for (int i = 0; i < videoUrls.length; i++) {
+                String url = videoUrls[i].trim();
+                if (!url.isEmpty()) {
+                    BoilerTaskOrderArchiveDetailRespVO.AttachmentFile af = new BoilerTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < videoNames.length ? videoNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allVideos.add(af);
+                }
+            }
+            String[] attachmentUrls = reportDO.getAttachment() != null ? reportDO.getAttachment().split(",") : new String[0];
+            String[] attachmentNames = reportDO.getAttachmentName() != null ? reportDO.getAttachmentName().split(",") : new String[0];
+            for (int i = 0; i < attachmentUrls.length; i++) {
+                String url = attachmentUrls[i].trim();
+                if (!url.isEmpty()) {
+                    BoilerTaskOrderArchiveDetailRespVO.AttachmentFile af = new BoilerTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < attachmentNames.length ? attachmentNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allAttachments.add(af);
+                }
+            }
         }
+        taskOrderArchiveDetail.setImages(allImages);
+        taskOrderArchiveDetail.setVideos(allVideos);
+        taskOrderArchiveDetail.setAttachments(allAttachments);
         return taskOrderArchiveDetail;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -160,8 +160,11 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             boilerTaskOrderItemReportMapper.update(new LambdaUpdateWrapper<BoilerTaskOrderItemReportDO>()
                     .eq(BoilerTaskOrderItemReportDO::getId, item.getReportId())
                     .set(BoilerTaskOrderItemReportDO::getImage, item.getImage())
+                    .set(BoilerTaskOrderItemReportDO::getImageName, item.getImageName())
                     .set(BoilerTaskOrderItemReportDO::getVideo, item.getVideo())
+                    .set(BoilerTaskOrderItemReportDO::getVideoName, item.getVideoName())
                     .set(BoilerTaskOrderItemReportDO::getAttachment, item.getAttachment())
+                    .set(BoilerTaskOrderItemReportDO::getAttachmentName, item.getAttachmentName())
 
             );
         });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -97,7 +97,7 @@ import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportrecord.PipeTaskOrderItemReportRecordService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportversion.PipeTaskOrderItemReportVersionService;
 import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
-import cn.start.tz.module.pressure2.service.taskorderfile.TaskOrderFileService;
+
 import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
@@ -298,9 +298,6 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private FileApi fileApi;
 
-    @Resource
-    private TaskOrderFileService taskOrderFileService;
-
     @Resource
     private PushTaskOrderService pushTaskOrderService;
 
@@ -2500,24 +2497,48 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 }
             }
         }
-        // 查询附件文件
-        TaskOrderFilePageReqVO filePageReqVO = new TaskOrderFilePageReqVO();
-        filePageReqVO.setOrderItemId(orderItemId);
-        filePageReqVO.setPageSize(Integer.MAX_VALUE);
-        PageResult<TaskOrderFileDO> filePageResult =
-                taskOrderFileService.getTaskOrderFilePage(filePageReqVO);
-        if (CollUtil.isNotEmpty(filePageResult.getList())) {
-            List<PipeTaskOrderArchiveDetailRespVO.AttachmentFile> attachmentFiles = new ArrayList<>();
-            for (TaskOrderFileDO fileDO : filePageResult.getList()) {
-                PipeTaskOrderArchiveDetailRespVO.AttachmentFile attachmentFile = new PipeTaskOrderArchiveDetailRespVO.AttachmentFile();
-                attachmentFile.setId(fileDO.getId());
-                attachmentFile.setFileName(fileDO.getFileName());
-                attachmentFile.setFileUrl(fileDO.getFileUrl());
-                attachmentFile.setCreateTime(fileDO.getCreateTime());
-                attachmentFiles.add(attachmentFile);
-            }
-            taskOrderArchiveDetail.setAttachmentFiles(attachmentFiles);
+        // 收集附件文件（image/video/attachment）
+        List<PipeTaskOrderArchiveDetailRespVO.AttachmentFile> allImages = new ArrayList<>();
+        List<PipeTaskOrderArchiveDetailRespVO.AttachmentFile> allVideos = new ArrayList<>();
+        List<PipeTaskOrderArchiveDetailRespVO.AttachmentFile> allAttachments = new ArrayList<>();
+        for (PipeTaskOrderItemReportDO reportDO : taskOrderItemReportDOS) {
+            String[] imageUrls = reportDO.getImage() != null ? reportDO.getImage().split(",") : new String[0];
+            String[] imageNames = reportDO.getImageName() != null ? reportDO.getImageName().split(",") : new String[0];
+            for (int i = 0; i < imageUrls.length; i++) {
+                String url = imageUrls[i].trim();
+                if (!url.isEmpty()) {
+                    PipeTaskOrderArchiveDetailRespVO.AttachmentFile af = new PipeTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < imageNames.length ? imageNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allImages.add(af);
+                }
+            }
+            String[] videoUrls = reportDO.getVideo() != null ? reportDO.getVideo().split(",") : new String[0];
+            String[] videoNames = reportDO.getVideoName() != null ? reportDO.getVideoName().split(",") : new String[0];
+            for (int i = 0; i < videoUrls.length; i++) {
+                String url = videoUrls[i].trim();
+                if (!url.isEmpty()) {
+                    PipeTaskOrderArchiveDetailRespVO.AttachmentFile af = new PipeTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < videoNames.length ? videoNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allVideos.add(af);
+                }
+            }
+            String[] attachmentUrls = reportDO.getAttachment() != null ? reportDO.getAttachment().split(",") : new String[0];
+            String[] attachmentNames = reportDO.getAttachmentName() != null ? reportDO.getAttachmentName().split(",") : new String[0];
+            for (int i = 0; i < attachmentUrls.length; i++) {
+                String url = attachmentUrls[i].trim();
+                if (!url.isEmpty()) {
+                    PipeTaskOrderArchiveDetailRespVO.AttachmentFile af = new PipeTaskOrderArchiveDetailRespVO.AttachmentFile();
+                    af.setUrl(url);
+                    af.setName(i < attachmentNames.length ? attachmentNames[i].trim() : url.substring(url.lastIndexOf('/') + 1));
+                    allAttachments.add(af);
+                }
+            }
         }
+        taskOrderArchiveDetail.setImages(allImages);
+        taskOrderArchiveDetail.setVideos(allVideos);
+        taskOrderArchiveDetail.setAttachments(allAttachments);
         return taskOrderArchiveDetail;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -196,8 +196,11 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             pipeTaskOrderItemReportMapper.update(new LambdaUpdateWrapper<PipeTaskOrderItemReportDO>()
                     .eq(PipeTaskOrderItemReportDO::getId, item.getReportId())
                     .set(PipeTaskOrderItemReportDO::getImage, item.getImage())
+                    .set(PipeTaskOrderItemReportDO::getImageName, item.getImageName())
                     .set(PipeTaskOrderItemReportDO::getVideo, item.getVideo())
+                    .set(PipeTaskOrderItemReportDO::getVideoName, item.getVideoName())
                     .set(PipeTaskOrderItemReportDO::getAttachment, item.getAttachment())
+                    .set(PipeTaskOrderItemReportDO::getAttachmentName, item.getAttachmentName())
 
             );
         });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskorderfile/TaskOrderFileService.java

@@ -7,7 +7,6 @@ import cn.start.tz.module.pressure2.dal.dataobject.taskorderfile.TaskOrderFileDO
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.common.pojo.PageParam;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 任务单附件 Service 接口
@@ -54,15 +53,4 @@ public interface TaskOrderFileService extends IService<TaskOrderFileDO>  {
      */
     PageResult<TaskOrderFileDO> getTaskOrderFilePage(TaskOrderFilePageReqVO pageReqVO);
 
-    /**
-     * 上传文件并创建附件记录
-     *
-     * @param file 上传的文件
-     * @param orderId 任务单ID
-     * @param orderItemId 检验设备单ID
-     * @param equipMainType 设备类型 200锅炉 300管道
-     * @return 附件记录
-     */
-    TaskOrderFileDO uploadAndCreate(MultipartFile file, String orderId, String orderItemId, Integer equipMainType);
-
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskorderfile/TaskOrderFileServiceImpl.java

@@ -14,9 +14,6 @@ import cn.start.tz.framework.common.pojo.PageParam;
 import cn.start.tz.framework.common.util.object.BeanUtils;
 
 import cn.start.tz.module.pressure2.dal.mysql.taskorderfile.TaskOrderFileMapper;
-import cn.start.tz.module.infra.api.file.FileApi;
-import org.springframework.web.multipart.MultipartFile;
-import cn.hutool.core.io.IoUtil;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.start.tz.module.pressure2.enums.ErrorCodeConstants.*;
@@ -33,9 +30,6 @@ public class TaskOrderFileServiceImpl extends ServiceImpl<TaskOrderFileMapper, T
     @Resource
     private TaskOrderFileMapper taskOrderFileMapper;
 
-    @Resource
-    private FileApi fileApi;
-
     @Override
     public String createTaskOrderFile(TaskOrderFileSaveReqVO createReqVO) {
         // 插入
@@ -62,26 +56,6 @@ public class TaskOrderFileServiceImpl extends ServiceImpl<TaskOrderFileMapper, T
         taskOrderFileMapper.deleteById(id);
     }
 
-    @Override
-    public TaskOrderFileDO uploadAndCreate(MultipartFile file, String orderId, String orderItemId, Integer equipMainType) {
-        try {
-            // 上传文件到文件服务
-            byte[] content = IoUtil.readBytes(file.getInputStream());
-            String fileUrl = fileApi.createFile(file.getOriginalFilename(), null, content);
-            // 创建附件记录
-            TaskOrderFileDO taskOrderFile = new TaskOrderFileDO();
-            taskOrderFile.setFileUrl(fileUrl);
-            taskOrderFile.setFileName(file.getOriginalFilename());
-            taskOrderFile.setOrderId(orderId);
-            taskOrderFile.setOrderItemId(orderItemId);
-            taskOrderFile.setEquipMainType(equipMainType);
-            taskOrderFileMapper.insert(taskOrderFile);
-            return taskOrderFile;
-        } catch (Exception e) {
-            throw exception(TASK_ORDER_FILE_UPLOAD_FAIL);
-        }
-    }
-
     private void validateTaskOrderFileExists(String id) {
         if (taskOrderFileMapper.selectById(id) == null) {
             throw exception(TASK_ORDER_FILE_NOT_EXISTS);