From 61f0ed42abb8b3a270f3dcefeff988da5e73a5fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:55:05 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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..0f3ca73 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,16 +3,19 @@
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;
+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.*;
import javax.annotation.Resource;
@@ -44,8 +47,9 @@
@ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
})
@GetMapping("/selectAllReport")
- public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name) {
- IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name);
+ @AuthHandler
+ public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name,boolean checked) {
+ IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name, checked);
Map<String, Object> map = new HashMap<>();
map.put("total", reportPage.getTotal());
map.put("row", reportPage.getRecords());
@@ -57,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));
}
@@ -67,9 +72,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, 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);
return Result.success(reportService.check((String) unmarshal.get("name"), id, result));
}
@@ -78,9 +85,26 @@
@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));
+ }
+
+ @GetMapping("/getEnterprise")
+ @ApiOperation("鑾峰彇浼佷笟淇℃伅")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.checkTheReport,isAdd = true)
+ public Result getEnterprise() {
+ return Result.success(reportService.getEnterprise());
+ }
}
--
Gitblit v1.9.3