From de39b8ac2b5e98441e60917e9502239d42dfada9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 02:24:56 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 c580fc2..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,24 +1,21 @@
package com.yuanchu.mom.controller;
-import cn.hutool.core.lang.UUID;
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;
import javax.annotation.Resource;
import java.io.File;
-import java.util.HashMap;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Map;
@RestController
@@ -40,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) {
@@ -58,7 +48,7 @@
if (!realpath.exists()) {
realpath.mkdirs();
}
- pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+ 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));
@@ -79,4 +69,22 @@
return Result.success();
}
+ @ApiOperation(value = "鎻愪氦")
+ @PostMapping("/writeReport")
+ public Result writeReport(Integer id) {
+ return Result.success(insReportService.writeReport(id));
+ }
+
+ @ApiOperation(value = "瀹℃牳")
+ @PostMapping("/examineReport")
+ public Result examineReport(Integer id, Integer isExamine, String examineTell) {
+ return Result.success(insReportService.examineReport(id, isExamine, examineTell));
+ }
+
+ @ApiOperation(value = "鎵瑰噯")
+ @PostMapping("/ratifyReport")
+ public Result ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
+ return Result.success(insReportService.ratifyReport(id, isRatify, ratifyTell));
+ }
+
}
--
Gitblit v1.9.3