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)); + } + }