Merge remote-tracking branch 'origin/master'

value

2024-04-29 8577a11e5093871b2b5d6988431e7e22e76d43e6

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java

@@ -1,18 +1,13 @@
package com.yuanchu.mom.controller;

import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsReportService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -21,7 +16,6 @@
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;

@RestController
@@ -43,13 +37,6 @@
        return Result.success(insReportService.pageInsReport(page, reportPageDto));
    }

    @ApiOperation(value = "Word转HTML")
    @PostMapping("/wordToHtml")
    @ValueAuth
    public Result wordToHtml(String path) {
        return Result.success("转换成功", insReportService.wordToHtml(path));
    }

    @ApiOperation(value = "报告上传")
    @PostMapping("/inReport")
    public Result inReport(MultipartFile file, Integer id) {
@@ -64,7 +51,7 @@
            pathName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss")) + "_" + file.getOriginalFilename();
            urlString = realpath + "/" + pathName;
            file.transferTo(new File(urlString));
            return Result.success(insReportService.inReport("/word/" + pathName, id));
            return Result.success(insReportService.inReport("/word/"+pathName, id));
        } catch (Exception e) {
            throw new ErrorException("文件上传失败");
        }