From 39f799b4eb5aad2d6fbe11f4154f879e51a45039 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 09 五月 2024 15:48:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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..6a40450 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,11 +1,9 @@
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.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;
@@ -21,11 +19,11 @@
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
import java.util.Map;
@RestController
@RequestMapping("/insReport")
+@AllArgsConstructor
@Api("妫�楠屾姤鍛�")
public class InsReportController {
@@ -34,7 +32,7 @@
@Value("${wordUrl}")
private String wordUrl;
-
+ @ValueAuth
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
@PostMapping("/pageInsReport")
public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
@@ -43,15 +41,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;
@@ -64,36 +56,36 @@
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("鏂囦欢涓婁紶澶辫触");
}
}
-
+ @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) {
--
Gitblit v1.9.3