config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关...

liding

11 小时以前 dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5

 src/main/java/com/ruoyi/account/controller/AccountFileController.java

@@ -1,71 +1,129 @@
package com.ruoyi.account.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.basic.mapper.StorageAttachmentMapper;
import com.ruoyi.basic.mapper.StorageBlobMapper;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 财务附件
 */
@RestController
@RequiredArgsConstructor
@Tag(name = "账户附件管理")
@RequestMapping("/account/accountFile")
@Tag(name = "财务附件")
public class AccountFileController {

    private final StorageAttachmentMapper storageAttachmentMapper;
    private final StorageBlobMapper storageBlobMapper;
    private final FileUtil fileUtil;

    @Resource
    private AccountFileService accountFileService;


    /**
     * 新增
     * @param accountFile
     * @return
     */
    @PostMapping("/add")
    @Operation(summary = "新增")
    public AjaxResult add(@RequestBody AccountFile accountFile) {
        return AjaxResult.success(accountFileService.save(accountFile));
    }

    /**
     * 删除
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    @Operation(summary = "删除")
    public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(accountFileService.removeBatchByIds(ids));
    }

    /**
     *分页查询
     * @param page
     * @param accountFile
     * @return
     */
    @GetMapping("/listPage")
    @Operation(summary = "分页查询")
    public AjaxResult accountFileListPage(Page page, AccountFile accountFile) {
        return AjaxResult.success(accountFileService.accountFileListPage(page, accountFile));
    @Operation(summary = "分页查询附件列表")
    public R listPage(
            @RequestParam Long accountId,
            @RequestParam String accountType,
            @RequestParam(defaultValue = "1") Long current,
            @RequestParam(defaultValue = "10") Long size) {

        Page<StorageBlobVO> page = new Page<>(current, size);

        LambdaQueryWrapper<StorageAttachment> queryWrapper = new LambdaQueryWrapper<StorageAttachment>()
                .eq(StorageAttachment::getRecordType, accountType)
                .eq(StorageAttachment::getRecordId, accountId);

        Long total = storageAttachmentMapper.selectCount(queryWrapper);
        page.setTotal(total);

        if (total == 0) {
            page.setRecords(new ArrayList<>());
            return R.ok(page);
        }

        List<StorageAttachment> storageAttachments = storageAttachmentMapper.selectList(queryWrapper);
        Map<Long, Long> blobIdToAttachmentIdMap = storageAttachments.stream()
                .collect(Collectors.toMap(StorageAttachment::getStorageBlobId, StorageAttachment::getId));

        List<Long> storageBlobIds = storageAttachments.stream()
                .map(StorageAttachment::getStorageBlobId)
                .collect(Collectors.toList());

        List<StorageBlob> storageBlobs = storageBlobMapper.selectByIds(storageBlobIds);
        List<StorageBlobVO> storageBlobVOS = new ArrayList<>();
        for (StorageBlob storageBlob : storageBlobs) {
            StorageBlobVO storageBlobVO = new StorageBlobVO();
            BeanUtils.copyProperties(storageBlob, storageBlobVO);
            storageBlobVO.setPreviewURL(fileUtil.buildSignedPreviewUrl(storageBlobVO));
            storageBlobVO.setUrl(fileUtil.buildSignedPreviewUrl(storageBlobVO));
            storageBlobVO.setName(storageBlob.getOriginalFilename());
            storageBlobVO.setDownloadURL(fileUtil.buildSignedDownloadUrl(storageBlobVO));
            storageBlobVO.setStorageAttachmentId(blobIdToAttachmentIdMap.get(storageBlob.getId()));
            storageBlobVOS.add(storageBlobVO);
        }

        page.setRecords(storageBlobVOS);
        return R.ok(page);
    }

    @PostMapping("/add")
    @Operation(summary = "保存附件")
    public R add(@RequestBody Map<String, Object> params) {
        Long accountId = params.get("accountId") != null ? Long.valueOf(params.get("accountId").toString()) : null;
        String accountType = params.get("accountType") != null ? params.get("accountType").toString() : null;

        Long storageBlobId = null;
        if (params.get("id") != null) {
            storageBlobId = Long.valueOf(params.get("id").toString());
        } else if (params.get("url") != null) {
            String url = params.get("url").toString();
            int previewIdx = url.indexOf("/preview/");
            if (previewIdx >= 0) {
                String afterPreview = url.substring(previewIdx + "/preview/".length());
                int queryIdx = afterPreview.indexOf("?");
                String uidFilename = queryIdx >= 0 ? afterPreview.substring(0, queryIdx) : afterPreview;
                StorageBlob blob = storageBlobMapper.selectOne(new LambdaQueryWrapper<StorageBlob>()
                        .eq(StorageBlob::getUidFilename, uidFilename).last("limit 1"));
                if (blob != null) {
                    storageBlobId = blob.getId();
                }
            }
        }

        if (accountId == null || accountType == null || storageBlobId == null) {
            return R.fail("参数不完整");
        }

        StorageAttachment storageAttachment = new StorageAttachment();
        storageAttachment.setRecordType(accountType);
        storageAttachment.setRecordId(accountId);
        storageAttachment.setStorageBlobId(storageBlobId);
        storageAttachment.setDeleted(0L);
        storageAttachmentMapper.insert(storageAttachment);

        return R.ok();
    }

    @DeleteMapping("/del")
    @Operation(summary = "删除附件")
    public R del(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return R.fail("参数不能为空");
        }
        fileUtil.deleteStorageAttachmentsByStorageAttachmentIds(ids);
        return R.ok();
    }
}