From 4800caf0bc511a26624da1b9a9cf34275b6c2c4a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 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 ebe036d..1b3c366 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
@@ -5,8 +5,15 @@
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.mapper.LinkDetectionMapper;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.InspectionService;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
@@ -15,8 +22,10 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +45,13 @@
@Autowired
private LinkBasicInformationService linkBasicInformationService;
+
+
+ @Resource
+ private InspectionService inspectionService;
+
+ @Resource
+ private LinkDetectionMapper linkDetectionMapper;
@ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
@@ -71,15 +87,64 @@
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
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.commissionInspection,isAdd = true)
public Result<?> delLink(Integer id){
linkBasicInformationService.delLink(id);
return Result.success("鍒犻櫎鎴愬姛!");
}
+
+ @ApiOperation("閫夋嫨鐗堟湰")
+ @GetMapping("/chooseVer")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "id", dataTypeClass = String.class, required = true),
+ })
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result<?> chooseVer(String name, String id, String specifications) {
+ LinkDetection linkDetection = linkDetectionMapper.selectById(id);
+ return Result.success(linkBasicInformationService.chooseVer(linkDetection));
+ }
+
+
+ @ApiOperation(value = "鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "mcode", value = "浜у搧缂栧彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂扮増鏈�)", dataTypeClass = Integer.class,required = true ),
+ @ApiImplicitParam(name = "id", value = "濮旀墭淇℃伅id", dataTypeClass = Integer.class,required = true )
+ })
+ @GetMapping("/lookProByVer")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result lookProByVer(String name, String mcode, String specifications,Integer version,Integer id) {
+ return Result.success(linkBasicInformationService.lookProByVer(name,mcode, specifications,version,id));
+ }
+
+
+ @ApiOperation(value = "濮旀墭鍝佺敓鎴愭姤妫�鍗�")
+ @PostMapping("/addInspect")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result addInspect(@RequestHeader("X-Token") String token, @Validated @RequestBody InspectionVo inspectionVo) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ LinkDetection linkDetection = linkDetectionMapper.selectById(inspectionVo.getId());
+ inspectionVo.setMcode(linkDetection.getSampleNumber());
+ inspectionVo.setExperiment(linkDetection.getExperiment());
+ inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
+ inspectionVo.setUnit(linkDetection.getUnit());
+ inspectionVo.setNotes(linkDetection.getRemarks());
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
+ }
+
}
--
Gitblit v1.9.3