From e9b7d03fc16bfccea8e027b46319bcbac5cdaf55 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Thu, 21 Aug 2025 16:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=81=94=E7=B3=BB=E5=8D=95PDF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectBigScreenController.java | 11 ++- .../controller/BusPurchaseDocController.java | 11 +-- .../cailiaoshebei/controller/constant.java | 9 +++ .../service/IBusPurchaseDocService.java | 4 +- .../impl/BusPurchaseDocServiceImpl.java | 68 +++++++++++++++---- 5 files changed, 75 insertions(+), 28 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java index 13731344..f16b4a5e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java @@ -1,12 +1,8 @@ package org.dromara.bigscreen.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.validation.constraints.NotNull; -import org.dromara.common.core.domain.R; -import org.dromara.tender.domain.vo.BusBiddingPlanAnnexVo; +import jakarta.annotation.Resource; +import org.dromara.bigscreen.service.ProjectBigScreenService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,6 +15,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/project/big/screen") public class ProjectBigScreenController { + @Resource + private ProjectBigScreenService projectBigScreenService; + // @GetMapping("/{projectId}") // public R getInfo(@NotNull(message = "主键不能为空") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java index f66eeac5..0b29a798 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java @@ -57,6 +57,7 @@ public class BusPurchaseDocController extends BaseController { private final IBusBillofquantitiesVersionsService busBillofquantitiesVersionsService; private final IBusBillofquantitiesService busBillofquantitiesService; + /** * 查询物资-采购联系单列表 */ @@ -101,12 +102,12 @@ public class BusPurchaseDocController extends BaseController { } /** - * 获取物资-采购联系单详细信息图片 + * 获取物资-采购联系单详细PDF * * @param id 主键 */ - @SaCheckPermission("cailiaoshebei:purchaseDoc:querPic") - @GetMapping("/pic/{id}") + @SaCheckPermission("cailiaoshebei:purchaseDoc:queryPdf") + @GetMapping("/pdf/{id}") public R getPic(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok("操作成功", busPurchaseDocService.queryPicBase64ById(id)); @@ -179,8 +180,8 @@ public class BusPurchaseDocController extends BaseController { .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) .last("limit 1") ); - if (one == null){ - throw new ServiceException("请先完成物资工程量清单"); + if (one == null) { + throw new ServiceException("请先完成物资工程量清单"); } List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() .eq(BusBillofquantities::getVersions, one.getVersions()) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java index 1d3c8250..54030bbf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java @@ -4,6 +4,7 @@ import org.dromara.cailiaoshebei.domain.BusPurchaseDoc; import org.dromara.common.core.utils.DateUtils; import java.text.SimpleDateFormat; +import java.util.Date; /** * @Author 铁憨憨 @@ -27,6 +28,14 @@ public class constant { return String.format("%s%s/%s", PURCHASE_DOC_FILE_URL, purchaseDoc.getId(), timestamp); } + /** + * 获取物资采购联系单文件名 + */ + public static String getBusPurchaseDocFileUrl(BusPurchaseDoc purchaseDoc, Date updateTime) { + String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(updateTime); + return String.format("%s%s/%s", PURCHASE_DOC_FILE_URL, purchaseDoc.getId(), timestamp); + } + /** * 获取物资采购联系单文件名 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusPurchaseDocService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusPurchaseDocService.java index 6ff7307c..a1edc6a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusPurchaseDocService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusPurchaseDocService.java @@ -91,10 +91,10 @@ public interface IBusPurchaseDocService extends IService { void exportWordById(Long id, HttpServletResponse response); /** - * 根据主键查询详情图片base64 + * 根据主键查询详情PDF地址 * * @param id 主键id - * @return 详情图片base64 + * @return 详情PDF地址 */ String queryPicBase64ById(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java index 86607ae3..a47ea32c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java @@ -36,6 +36,7 @@ import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; @@ -60,6 +61,7 @@ import java.net.URLConnection; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -287,10 +289,12 @@ public class BusPurchaseDocServiceImpl extends ServiceImpl items = new ArrayList<>(); List planDocAssociationList = planDocAssociationService.lambdaQuery() @@ -311,6 +319,7 @@ public class BusPurchaseDocServiceImpl extends ServiceImpl