From a5bb8975516dd8701c600db3719422cde103e172 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 17 Sep 2025 10:30:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=B8=9A=E5=8A=A1=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20API=20=E6=96=B0=E5=A2=9E=E5=B8=A6=20url=20?= =?UTF-8?q?=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= =?UTF-8?q?=202.=20=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=9B=BD=E5=AE=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e6b063491f612b96a26cfac658e8f95b549dfeef) --- .../module/infra/api/businessfile/BusinessFileApi.java | 5 +++++ .../infra/api/businessfile/BusinessFileApiImpl.java | 8 ++++++++ .../module/system/controller/admin/ip/AreaController.java | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApi.java b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApi.java index e8460a8f..c1aaee72 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApi.java +++ b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApi.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFilePageReqDTO; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileRespDTO; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileSaveReqDTO; +import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import cn.iocoder.yudao.module.infra.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -55,6 +56,10 @@ public interface BusinessFileApi { @Operation(summary = "获得业务附件关联分页") CommonResult> getBusinessFilePage(@Valid BusinessFilePageReqDTO pageReqDTO); + @GetMapping(PREFIX + "/page-with-url") + @Operation(summary = "获得业务附件关联分页（带URL）") + CommonResult> getBusinessFilePageWithUrl(@Valid BusinessFilePageReqDTO pageReqDTO); + @DeleteMapping(PREFIX + "/delete-by-business") @Operation(summary = "根据业务Id和来源删除业务附件关联") @Parameter(name = "businessId", description = "业务Id", required = true) diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApiImpl.java b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApiImpl.java index be549ce8..9bf6d0b4 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApiImpl.java +++ b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/businessfile/BusinessFileApiImpl.java @@ -6,8 +6,10 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFilePageReqDTO; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileRespDTO; import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileSaveReqDTO; +import cn.iocoder.yudao.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import cn.iocoder.yudao.module.infra.controller.admin.businessfile.vo.BusinessFilePageReqVO; import cn.iocoder.yudao.module.infra.controller.admin.businessfile.vo.BusinessFileSaveReqVO; +import cn.iocoder.yudao.module.infra.controller.admin.businessfile.vo.BusinessFileWithUrlRespVO; import cn.iocoder.yudao.module.infra.dal.dataobject.businessfile.BusinessFileDO; import cn.iocoder.yudao.module.infra.service.businessfile.BusinessFileService; import jakarta.annotation.Resource; @@ -71,6 +73,12 @@ public class BusinessFileApiImpl implements BusinessFileApi { return success(BeanUtils.toBean(pageResult, BusinessFileRespDTO.class)); } + @Override + public CommonResult> getBusinessFilePageWithUrl(BusinessFilePageReqDTO pageReqDTO) { + PageResult pageResult = businessFileService.getBusinessFilePageWithUrl(BeanUtils.toBean(pageReqDTO, BusinessFilePageReqVO.class)); + return success(BeanUtils.toBean(pageResult, BusinessFileWithUrlRespDTO.class)); + } + @Override public CommonResult deleteBusinessFileByBusinessIdAndSource(Long businessId, String source) { businessFileService.deleteBusinessFileByBusinessIdAndSource(businessId, source); diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java index b2f95d69..24e88fd3 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java @@ -47,4 +47,12 @@ public class AreaController { return success(AreaUtils.format(area.getId())); } + @GetMapping("/global") + @Operation(summary = "获得国家列表") + public CommonResult> getAreaTreeGlobal() { + Area area = AreaUtils.getArea(Area.ID_GLOBAL); + Assert.notNull(area, "获取不到国家信息"); + return success(BeanUtils.toBean(area.getChildren(), AreaNodeRespVO.class)); + } + }