From fc4f4e0dd0ddb92065a81fcce6e99cc5dbf80068 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 24 八月 2023 18:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
index 50b9302..01c93e6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -5,16 +5,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -31,10 +33,8 @@
@RestController
@RequestMapping("/report")
public class ReportController {
- /**
- * 鏈嶅姟瀵硅薄
- */
- @Autowired
+
+ @Resource
private ReportService reportService;
@ApiOperation("鏌ヨ妫�楠屾姤鍛�")
@@ -53,5 +53,36 @@
return Result.success(map);
}
+ @ApiOperation("鎻愪氦")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/submit")
+ public Result submit(Integer id) {
+ return Result.success(reportService.submit(id));
+ }
+
+ @ApiOperation("瀹℃牳")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "result", value = "瀹℃牳缁撹", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/check")
+ public Result check(@RequestHeader("X-Token") String token, Integer id, String result) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ MyUtil.PrintLog(unmarshal + "-------id" + id + "=========" + result);
+ return Result.success(reportService.check((String) unmarshal.get("name"), id, result));
+ }
+
+ @ApiOperation("鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delreport")
+ public Result delreport(Integer id) {
+ return Result.success(reportService.delreport(id));
+ }
+
}
--
Gitblit v1.9.3