From eb1a57285bb3468a4efe051781b8cc7a13ec23c6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:06 +0800
Subject: [PATCH] 部分调整
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 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..8d05746 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,10 +1,9 @@
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.annotation.ValueClassify;
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;
@@ -18,11 +17,13 @@
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
@RequestMapping("/insReport")
+//@AllArgsConstructor
@Api("妫�楠屾姤鍛�")
public class InsReportController {
@@ -32,6 +33,7 @@
@Value("${wordUrl}")
private String wordUrl;
+ @ValueAuth
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
@PostMapping("/pageInsReport")
public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
@@ -40,15 +42,9 @@
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")
+ @ValueAuth
public Result inReport(MultipartFile file, Integer id) {
String urlString;
String pathName;
@@ -58,7 +54,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));
@@ -66,17 +62,35 @@
throw new ErrorException("鏂囦欢涓婁紶澶辫触");
}
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎶ュ憡杩樺師")
@PostMapping("/upReportUrl")
public Result upReportUrl(Integer id) {
return Result.success(insReportService.upReportUrl(id));
}
-
+ @ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎶ュ憡鍦ㄧ嚎缂栧埗")
@GetMapping("/upReportFile")
public Result upReportFile() {
return Result.success();
}
+ @ValueClassify("鎶ュ憡缂栧埗")
+ @ApiOperation(value = "鎻愪氦")
+ @PostMapping("/writeReport")
+ public Result writeReport(Integer id) {
+ return Result.success(insReportService.writeReport(id));
+ }
+ @ValueClassify("鎶ュ憡缂栧埗")
+ @ApiOperation(value = "瀹℃牳")
+ @PostMapping("/examineReport")
+ public Result examineReport(Integer id, Integer isExamine, String examineTell) {
+ return Result.success(insReportService.examineReport(id, isExamine, examineTell));
+ }
+ @ValueClassify("鎶ュ憡缂栧埗")
+ @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