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/LinkBasicInformationController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 6a21f00..bb5a18a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -2,7 +2,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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.LinkBasicInformation;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -36,6 +41,7 @@
@ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
+ @AuthHandler
public Result<?> getLink() {
Object link1 = null;
try {
@@ -48,7 +54,7 @@
return Result.success(link1);
}
- @ApiOperation(value = "鍒嗛〉琛ㄦ牸", tags = "123")
+ @ApiOperation(value = "鍒嗛〉琛ㄦ牸")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
@@ -58,6 +64,7 @@
@ApiImplicitParam(name = "inspectionStatus", value = "妫�楠岀姸鎬�", dataTypeClass = Integer.class)
})
@GetMapping("/page")
+ @AuthHandler
public Result<?> getLinkBasicPage(Integer pageNo, Integer pageSize, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) {
IPage<Map<String, Object>> linkBasicPage = linkBasicInformationService.getLinkBasicPage(new Page<Object>(pageNo, pageSize), entrustCoding, sampleName, entrusted, inspectionStatus);
Map<String, Object> map = new HashMap<>();
@@ -65,4 +72,22 @@
map.put("row", linkBasicPage.getRecords());
return Result.success(map);
}
+
+ @ApiOperation("鏍规嵁id鏌ヨSpecifications琛ㄧ殑Name")
+ @GetMapping("/getSpecificationsName")
+ public Result<?> getSpecificationsName(String id){
+ return Result.success(linkBasicInformationService.getSpecificationsName(id));
+ }
+
+ @ApiOperation("鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "濮旀墭鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delLink")
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result<?> delLink(Integer id){
+ linkBasicInformationService.delLink(id);
+ return Result.success("鍒犻櫎鎴愬姛!");
+ }
+
}
--
Gitblit v1.9.3