检测信息导出

xuhy

2026-01-17 9590a01153dbeeb4d11ec1cb387a3c4e10f2a8fb

检测信息导出

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysInspectionController.java

@@ -345,7 +345,7 @@
//                "E:\\WXWork\\1688857451467088\\Cache\\File\\2026-01\\",
//                "处方单-样例.docx",
//                templateParam,
//                "处方单-样例-temp",
//                "处方单-"+sysInspection.getNickName(),
//                "E:\\WXWork\\1688857451467088\\Cache\\File\\2026-01\\");
        return R.ok(url);
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/PdfUtils.java

@@ -392,7 +392,7 @@
        // windows
//        String url = "file:///E:\\WXWork\\1688857451467088\\Cache\\File\\2026-01\\"+fileName;
//        String filePath = "E:\\WXWork\\1688857451467088\\Cache\\File\\2026-01";
//        String s = wordToPdf(url,filePath, fileName);
//        String result = wordToPdf(url,filePath, fileName);
        // linux
        String filePath = "/usr/local/project/template/";
        String result = wordToPdf(filePath, fileName);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java

@@ -230,6 +230,15 @@
        }
    }

    /**
     * 生成PDF文件
     * @param basePackagePath 模板文件所在的包路径
     * @param templateFileName 模板文件名
     * @param templateParam 模板参数
     * @param fileName  填充参数后的word文件名
     * @param saveDirectory 填充参数后的word保存文件目录
     * @return
     */
    public String generatePdf(String basePackagePath, String templateFileName, Map<String,Object> templateParam, String fileName, String saveDirectory) {
        try {
            fillTemplate(basePackagePath+templateFileName, saveDirectory+fileName+".docx", templateParam);

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java

@@ -180,7 +180,7 @@
                || Objects.isNull(sysAppUser.getBirthTime())
                || Objects.isNull(sysAppUser.getUserHeight())
                || Objects.isNull(sysAppUser.getUserWeight())){
            return R.fail("请先完善用户信息");
            return R.fail("请完善健康检测及获取报告必需信息");
        }

        if(StringUtils.isBlank(sysAppUser.getIdentifierNumber())){

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TErpGoodsInfoSaveDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -99,4 +100,11 @@

    @ApiModelProperty(value = "详情图")
    private String detailPictures;

    @ApiModelProperty(value = "制剂规格")
    private String formulationSpec;

    @ApiModelProperty(value = "包装规格")
    private String packingSpec;

}

 ruoyi-system/src/main/java/com/ruoyi/system/utils/util/ObsUploadUtil.java

@@ -27,7 +27,7 @@
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            fileName =  originalFilename.subSequence(0,originalFilename.lastIndexOf("."))+"-"+UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            obsClient.putObject(bucketName,"file/"+fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
@@ -42,7 +42,7 @@
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            fileName =  originalFilename.subSequence(0,originalFilename.lastIndexOf("."))+"-"+UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            obsClient.putObject(bucketName,"file/"+fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);