From 9a6b1b5185d4986d74ab466ca3d78a121010581b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 11:11:06 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 1 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java | 7 -------
sys/src/main/resources/application-dev.yml | 2 +-
3 files changed, 2 insertions(+), 8 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 85cb28e..2bdaa5d 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
@@ -51,7 +51,6 @@
@ApiOperation("閾炬帴-->鑾峰彇鏍峰搧鍚嶇О")
@GetMapping("/material")
- @AuthHandler
public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -65,7 +64,6 @@
@ApiOperation("閾炬帴-->鑾峰彇瑙勬牸鍨嬪彿")
@GetMapping("/specification")
- @AuthHandler
public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -80,7 +78,6 @@
@ApiImplicitParam(name = "modelId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/chooseProject")
- @AuthHandler
public Result<?> chooseProject(@RequestHeader("link") String link, Integer modelId) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -93,7 +90,6 @@
@ApiOperation("閾炬帴-->娣诲姞濮旀墭鎶ユ鐢宠鍗�")
@PostMapping("/addInspection")
- @AuthHandler
public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
String redisLink = RedisUtil.get("viewId").toString();
if (linkBasicInformationService.isIfViewUUID(redisLink)){
@@ -111,21 +107,18 @@
@ApiOperation(value = "鐢熸垚浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
@GetMapping("/getViewUUID")
- @AuthHandler
public Result<?> getViewUUID(int day){
return Result.success("鐢熸垚鎴愬姛",linkBasicInformationService.getViewUUID(day));
}
@ApiOperation(value = "鏌ヨ浜岀淮鐮佹墍闇�鐨勫敮涓�鐮�")
@GetMapping("/selectViewUUID")
- @AuthHandler
public Result<?> selectViewUUID(){
return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.selectViewUUID());
}
@ApiOperation(value = "妫�楠屽敮涓�鐮佹槸鍚︽湁鏁�")
@GetMapping("/isIfViewUUID")
- @AuthHandler
public Result<?> isIfViewUUID(String viewId){
return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.isIfViewUUID(viewId));
}
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 7e17cfa..5399c22 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -26,6 +26,7 @@
specifications_models specifications,
unit,
quantity num,
+ surveyor,
DATE_FORMAT(inspection_date, '%Y-%m-%d') startTime,
DATE_FORMAT(date_survey, '%Y-%m-%d') endTime,
DATE_FORMAT(create_time, '%Y-%m-%d') formTime
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 85cf887..62f17fc 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -75,7 +75,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 50
+ timeout: 1000
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3