From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
index 85cb28e..be91e78 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
@@ -49,9 +49,10 @@
@Resource
ProductService productService;
+
+
@ApiOperation("閾炬帴-->鑾峰彇鏍峰搧鍚嶇О")
@GetMapping("/material")
- @AuthHandler
public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -65,7 +66,6 @@
@ApiOperation("閾炬帴-->鑾峰彇瑙勬牸鍨嬪彿")
@GetMapping("/specification")
- @AuthHandler
public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -80,7 +80,6 @@
@ApiImplicitParam(name = "modelId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/chooseProject")
- @AuthHandler
public Result<?> chooseProject(@RequestHeader("link") String link, Integer modelId) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -93,7 +92,6 @@
@ApiOperation("閾炬帴-->娣诲姞濮旀墭鎶ユ鐢宠鍗�")
@PostMapping("/addInspection")
- @AuthHandler
public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -111,22 +109,27 @@
@ApiOperation(value = "鐢熸垚浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
@GetMapping("/getViewUUID")
- @AuthHandler
public Result<?> getViewUUID(int day){
return Result.success("鐢熸垚鎴愬姛",linkBasicInformationService.getViewUUID(day));
}
@ApiOperation(value = "鏌ヨ浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
@GetMapping("/selectViewUUID")
- @AuthHandler
public Result<?> selectViewUUID(){
return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.selectViewUUID());
}
@ApiOperation(value = "妫�楠屽敮涓�鐮佹槸鍚︽湁鏁�")
@GetMapping("/isIfViewUUID")
- @AuthHandler
public Result<?> isIfViewUUID(String viewId){
return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.isIfViewUUID(viewId));
}
+
+
+ @ApiOperation("鑾峰彇鏍峰搧淇℃伅浠ュ強濮旀墭淇℃伅")
+ @GetMapping("/getContractsSampleInfo")
+ public Result<?> getContractsSampleInfo(String viewId){
+ return Result.success(linkBasicInformationService.getContractsSampleInfo(viewId));
+ }
+
}
--
Gitblit v1.9.3