From dd2554435b9ced61e2a6a06627145fca3bf2685b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 04 九月 2023 17:17:17 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 822c590..267e7df 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,6 +3,9 @@
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.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -13,7 +16,6 @@
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.*;
import javax.annotation.Resource;
@@ -45,6 +47,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<>();
@@ -58,6 +61,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));
}
@@ -68,7 +72,8 @@
@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 {
+ @AuthHandler
+ public Result check(@RequestHeader("X-Token") String token, Integer id, Integer 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);
@@ -80,6 +85,7 @@
@ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/delreport")
+ @AuthHandler
public Result delreport(Integer id) {
return Result.success(reportService.delreport(id));
}
@@ -89,9 +95,16 @@
@ApiImplicitParam(name = "code", value = "鎶ュ憡鍗曞彿", dataTypeClass = String.class, required = true)
})
@PostMapping("/getReportContext")
+ @AuthHandler
public Result getReportContext(String code) {
return Result.success(reportService.getReportContext(code));
}
+ @GetMapping("/getEnterprise")
+ @ApiOperation("鑾峰彇浼佷笟淇℃伅")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.checkTheReport,isAdd = true)
+ public Result getEnterprise() {
+ return Result.success(reportService.getEnterprise());
+ }
}
--
Gitblit v1.9.3