From 11a86d6a8432bfba2f3802440973271b283a475f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 24 八月 2023 18:03:16 +0800
Subject: [PATCH] 修改委托部分接口
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 34 ++++++++++++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java | 31 ++++++++++++---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java | 3 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 4 ++
6 files changed, 63 insertions(+), 11 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 22de441..01f505a 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
@@ -65,4 +65,5 @@
map.put("row", linkBasicPage.getRecords());
return Result.success(map);
}
+
}
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..1da481b 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
@@ -43,8 +43,8 @@
@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,8 +56,8 @@
@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);
}
@@ -67,8 +67,9 @@
@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.setUUID(redisLink);
String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
if (!ObjectUtils.isEmpty(code)){
return Result.success("娣诲姞鎴愬姛锛�", code);
@@ -79,4 +80,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));
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 4f53cb3..3edc996 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -40,6 +40,7 @@
})
@GetMapping("/selectAllPlan")
public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
+ System.out.println(planService.selectAllPlan(code, beginTime, endTime, status).toString());
return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
index 60e4a5a..847a506 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
@@ -86,4 +86,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "妫�楠屼俊鎭�")
private List<LinkDetection> linkDetectionList;
+
+ @ApiModelProperty(value = "鐢熸垚id锛氫綔鐢ㄤ簬鏈夋晥鏈熷唴鏌ヨ鍐呭鎵�鐢�")
+ private String UUID;
}
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 c347bca..3a4c2a5 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
@@ -31,5 +31,9 @@
*/
List<Map<String, Object>> selectLinkAll();
+ String getViewUUID(int day);
+ Map<String, String> selectViewUUID();
+
+ boolean isIfViewUUID(String uuid);
}
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 b14dab9..e9c83d9 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
@@ -4,21 +4,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
-import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
import com.yuanchu.limslaboratory.utils.MyUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -35,7 +34,7 @@
@Override
public String addLinkBasicInformation(LinkBasicInformation linkBasicInformation) {
- String code = MyUtil.getTimeSixNumberCode("SL","SL");
+ String code = MyUtil.getTimeSixNumberCode("SL", "SL");
linkBasicInformation.setEntrustCoding(code);
int insert = linkBasicInformationMapper.insert(linkBasicInformation);
if (insert == 1) {
@@ -56,5 +55,30 @@
return linkBasicInformationMapper.selectLinkAll();
}
+ @Override
+ public String getViewUUID(int day) {
+ String id = String.valueOf(UUID.randomUUID());
+ RedisUtil.set("viewId", id, day * 24 * 60);
+ return id;
+ }
+
+ @Override
+ public Map<String, String> selectViewUUID() {
+ Map<String, String> map = new HashMap<>();
+ try {
+ map.put("id", RedisUtil.get("viewId").toString());
+ map.put("time", String.valueOf(RedisUtil.getExpire("viewId")));
+ } catch (Exception e) {
+ map.put("id", null);
+ map.put("time", null);
+ }
+ return map;
+ }
+
+ @Override
+ public boolean isIfViewUUID(String uuid) {
+ return uuid.equals(RedisUtil.get("viewId"));
+ }
+
}
--
Gitblit v1.9.3