From 8577a11e5093871b2b5d6988431e7e22e76d43e6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 01:46:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 9b15c05..06e17de 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/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杞琀TML")
- @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("鏂囦欢涓婁紶澶辫触");
}
--
Gitblit v1.9.3