From bc248ab47562d61deba0ad802d3ae1b44de5d3a5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 14:42:38 +0800
Subject: [PATCH] 修改委托信息
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 14 +++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 47 +++++++++++++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 10 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 2 +
4 files changed, 73 insertions(+), 0 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 bb5a18a..bb9dc67 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
@@ -8,7 +8,10 @@
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
+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;
@@ -17,8 +20,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;
@@ -38,6 +43,10 @@
@Autowired
private LinkBasicInformationService linkBasicInformationService;
+
+
+ @Resource
+ private InspectionService inspectionService;
@ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
@@ -90,4 +99,42 @@
return Result.success("鍒犻櫎鎴愬姛!");
}
+
+ @ApiOperation("閫夋嫨鐗堟湰")
+ @GetMapping("/chooseVer")
+ @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)
+ })
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.commissionInspection,isAdd = true)
+ public Result<?> chooseVer(String name, String mcode, String specifications) {
+ return Result.success(inspectionService.chooseVer(name, mcode, specifications));
+ }
+
+
+ @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);
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
+ }
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index a3dea74..62b375b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -12,7 +12,9 @@
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -143,5 +145,13 @@
return Result.success(inspectionService.lookProByVer(name, mcode, specifications,version,null));
}
+ @ApiOperation(value = "鍘熸潗鏂欑敓鎴愭姤妫�鍗�")
+ @PostMapping("/addInspect")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.reportForInspection,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);
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
index 3f81fb4..c5a6db3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
@@ -44,4 +44,6 @@
void delLink(Integer id);
Specifications getSpecificationsName(String id);
+
+ Object lookProByVer(String name, String mcode, String specifications,Integer version, Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
index 4e216bd..c157d97 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -9,6 +9,7 @@
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.pojo.Specifications;
+import com.yuanchu.limslaboratory.service.InspectionService;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
@@ -20,6 +21,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -43,6 +45,9 @@
@Autowired
private SpecificationsMapper specificationsMapperOn;
+
+ @Resource
+ private InspectionService inspectionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -128,5 +133,14 @@
return specificationsMapperOn.selectOne(queryWrapper);
}
+ @Override
+ public Object lookProByVer(String name, String mcode, String specifications,Integer version, Integer id) {
+ LinkDetection linkDetection = linkDetectionMapper.selectById(id);
+ return inspectionService.lookProByVer(name, mcode, specifications, version, linkDetection.getExperiment());
+ }
+
+
+
+
}
--
Gitblit v1.9.3