From 1ab5a65898b12ca07cbf38eaf2028eeae2ce790c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 10:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 46c9563..603864b 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
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
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;
@@ -44,6 +46,7 @@
@ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
})
@GetMapping("/selectAllReport")
+ @AuthHandler
public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name) {
IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name);
Map<String, Object> map = new HashMap<>();
@@ -57,6 +60,7 @@
@ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/submit")
+ @AuthHandler
public Result submit(Integer id) {
return Result.success(reportService.submit(id));
}
@@ -67,9 +71,11 @@
@ApiImplicitParam(name = "result", value = "瀹℃牳缁撹", dataTypeClass = String.class, required = true)
})
@PostMapping("/check")
- public Result check(@RequestHeader("token") String token, Integer id, String result) throws Exception {
+ @AuthHandler
+ 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));
}
@@ -78,9 +84,20 @@
@ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/delreport")
+ @AuthHandler
public Result delreport(Integer id) {
return Result.success(reportService.delreport(id));
}
+ @ApiOperation("鑾峰彇鎶ュ憡鍐呯殑鏁版嵁")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "code", value = "鎶ュ憡鍗曞彿", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/getReportContext")
+ @AuthHandler
+ public Result getReportContext(String code) {
+ return Result.success(reportService.getReportContext(code));
+ }
+
}
--
Gitblit v1.9.3