From eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 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 82c0065..9ac5e99 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
@@ -4,17 +4,22 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.MaterialService;
+import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.service.StandardService;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -40,11 +45,14 @@
@Autowired
private StandardService standardService;
+ @Resource
+ ProductService productService;
+
@ApiOperation("閾炬帴-->鑾峰彇鏍峰搧鍚嶇О")
@GetMapping("/material")
public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
+ String redisLink = RedisUtil.get("viewId").toString();
+ if (linkBasicInformationService.isIfViewUUID(redisLink)){
LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
wrapper.select(Material::getId, Material::getName, Material::getCode);
List<Map<String, Object>> maps = materialService.listMaps(wrapper);
@@ -56,19 +64,35 @@
@ApiOperation("閾炬帴-->鑾峰彇瑙勬牸鍨嬪彿")
@GetMapping("/specification")
public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
+ String redisLink = RedisUtil.get("viewId").toString();
+ if (linkBasicInformationService.isIfViewUUID(redisLink)){
List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
return Result.success(specificationIdAndName);
}
return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
}
- @ApiOperation("閾炬帴-->娣诲姞妫�楠岀敵璇峰崟")
+ @ApiOperation("閾炬帴-->閫夋嫨璇曢獙椤圭洰")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "modelId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/chooseProject")
+ public Result<?> chooseProject(@RequestHeader("link") String link, Integer modelId) {
+ String redisLink = RedisUtil.get("viewId").toString();
+ if (linkBasicInformationService.isIfViewUUID(redisLink)){
+ //鏌ヨ鏍囧噯搴撲腑璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ return Result.success(productService.chooseProject(modelId));
+ }
+ return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
+
+ }
+
+ @ApiOperation("閾炬帴-->娣诲姞濮旀墭鎶ユ鐢宠鍗�")
@PostMapping("/addInspection")
public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
+ String redisLink = RedisUtil.get("viewId").toString();
+ if (linkBasicInformationService.isIfViewUUID(redisLink)){
+ linkBasicInformation.setUid(redisLink);
String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
if (!ObjectUtils.isEmpty(code)){
return Result.success("娣诲姞鎴愬姛锛�", code);
@@ -79,4 +103,22 @@
return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
}
+
+ @ApiOperation(value = "鐢熸垚浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
+ @GetMapping("/getViewUUID")
+ public Result<?> getViewUUID(int day){
+ return Result.success("鐢熸垚鎴愬姛",linkBasicInformationService.getViewUUID(day));
+ }
+
+ @ApiOperation(value = "鏌ヨ浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
+ @GetMapping("/selectViewUUID")
+ public Result<?> selectViewUUID(){
+ return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.selectViewUUID());
+ }
+
+ @ApiOperation(value = "妫�楠屽敮涓�鐮佹槸鍚︽湁鏁�")
+ @GetMapping("/isIfViewUUID")
+ public Result<?> isIfViewUUID(String viewId){
+ return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.isIfViewUUID(viewId));
+ }
}
--
Gitblit v1.9.3