Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

8 天以前 2f80b7085c4eabce06d3491306b75eecc275275f

 src/main/java/com/ruoyi/basic/controller/StorageAttachmentController.java

@@ -1,16 +1,10 @@
package com.ruoyi.basic.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.StorageAttachmentDTO;
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.service.StorageAttachmentService;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.enums.StorageAttachmentRecordType;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -18,27 +12,31 @@

@RestController
@AllArgsConstructor
@RequestMapping("/basic/storage_attachment")
@Tag(name = "通用上传")
@RequestMapping("/storageAttachment")
public class StorageAttachmentController {
    private StorageAttachmentService storageAttachmentService;

    /**
     * 分页查询通用文件上传的附件信息
     * @param page 分页参数
     *
     * @param storageAttachmentDTO 关联记录信息
     * @return 分页结果
     */
    @GetMapping("/listPage")
    public R listPage(Page page, StorageAttachmentDTO storageAttachmentDTO) {
        return R.ok(storageAttachmentService.listPage(page, storageAttachmentDTO));
    @GetMapping("/list")
    @Operation(summary = "分页查询通用文件上传的附件信息")
    public R list(StorageAttachmentDTO storageAttachmentDTO) {
        return R.ok(storageAttachmentService.list(storageAttachmentDTO));
    }

    /**
     * 删除通用文件上传的附件信息
     *
     * @param ids 文件id列表
     * @return 删除结果
     */
    @DeleteMapping("/delete")
    @Operation(summary = "删除通用文件上传的附件信息")
    public R batchDelete(@RequestBody List<Long> ids) {
        return R.ok(storageAttachmentService.batchDeleteStorageAttachment(ids));
    }
@@ -47,6 +45,7 @@
     * 保存通用文件上传的附件信息
     */
    @PostMapping("/add")
    @Operation(summary = "保存通用文件上传的附件信息")
    public R add(@RequestBody StorageAttachmentDTO storageAttachmentDTO) {
        storageAttachmentService.saveStorageAttachment(storageAttachmentDTO);
        return R.ok();