From e29f147aab5b0b0b794d611b522b67b94423e3cf Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 17:56:57 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 3edc996..5dca2be 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,7 +1,6 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -12,6 +11,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
import javax.annotation.Resource;
/**
@@ -36,22 +36,25 @@
@ApiImplicitParam(name = "code", value = "鐢宠鍗曠紪鍙�", dataTypeClass = String.class),
@ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = String.class),
@ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "status", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "status", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "isLookMe", value = "鏄惁鍙湅鎴�", dataTypeClass = Boolean.class)
})
@GetMapping("/selectAllPlan")
- public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
- System.out.println(planService.selectAllPlan(code, beginTime, endTime, status).toString());
- return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
+ @AuthHandler
+ public Result selectAllPlan(String code, String beginTime, String endTime, Integer status,boolean isLookMe) {
+ return Result.success(planService.selectAllPlan(code, beginTime, endTime, status,isLookMe));
}
@ApiOperation("鍒嗛厤-->閫夋嫨妫�楠屼汉")
@GetMapping("/choosecheck")
+ @AuthHandler
public Result choosecheck() {
return Result.success(planService.choosecheck());
}
@ApiOperation("鍒嗛厤--閫夋嫨璁惧")
@GetMapping("/chooseinstum")
+ @AuthHandler
public Result chooseinstum() {
return Result.success(planService.chooseinstum());
}
@@ -63,6 +66,7 @@
@ApiImplicitParam(name = "instrumentId", value = "璁惧id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/distribution")
+ @AuthHandler
public Result distribution(Integer id, Integer userId, Integer instrumentId) {
return Result.success(planService.distribution(id, userId, instrumentId));
}
@@ -73,6 +77,7 @@
@ApiImplicitParam(name = "value", value = "妫�楠屽��", dataTypeClass = String.class)
})
@PostMapping("/check")
+ @AuthHandler
public Result check(Integer id, String value) {
return Result.success(planService.check(id, value));
}
@@ -82,6 +87,7 @@
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/reported")
+ @AuthHandler
public Result reported(Integer id) {
return Result.success(planService.reported(id));
}
--
Gitblit v1.9.3