From 2b8767a3b089e8b69d2dd59795593b096ea699a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 17:57:58 +0800
Subject: [PATCH] 8-28 bug修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java | 3 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 26 +++++++++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 23 +++++------
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 15 +++++++
sys/src/main/resources/application-dev.yml | 2
5 files changed, 52 insertions(+), 17 deletions(-)
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 dc56db5..99d8572 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,9 +12,9 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -53,4 +53,24 @@
map.put("total", iPage.getTotal());
return Result.success(map);
}
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�娣诲姞")
+ @PostMapping("/add")
+ public Result<?> insertRawMaterial(@Validated @RequestBody RawMaterial rawMaterial) {
+ Integer integer = rawMaterialService.insertRawMaterial(rawMaterial);
+ if (integer >= 1) {
+ return Result.success("娣诲姞鎴愬姛");
+ }
+ return Result.fail("娣诲姞澶辫触");
+ }
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�鍒犻櫎")
+ @PostMapping("/delete")
+ public Result<?> deleteRawMaterial(String deleteId) {
+ Integer integer = rawMaterialService.deleteRawMaterial(deleteId);
+ if (integer >= 1) {
+ return Result.success("鍒犻櫎鎴愬姛");
+ }
+ return Result.fail("鍒犻櫎澶辫触");
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
index 04a0f4b..f4150b1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
@@ -27,43 +27,42 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�", required = true, example = "姹熻嫃榈烽洀")
private String supplierName;
- @ApiModelProperty(value = "鏉愭枡缂栫爜")
+ @ApiModelProperty(value = "鏉愭枡缂栫爜", required = true, example = "YCL202308290000002")
private String materialCoding;
- @ApiModelProperty(value = "鏉愭枡鍚嶇О")
+ @ApiModelProperty(value = "鏉愭枡鍚嶇О", required = true, example = "鍏夌氦")
private String materialName;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿", required = true, example = "GGXH2023")
private String specificationsModels;
- @ApiModelProperty(value = "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅", required = true, example = "KB")
private String unit;
- @ApiModelProperty(value = "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺", example = "100", required = true)
private Integer quantity;
- @ApiModelProperty(value = "鎶ユ鏃ユ湡")
+ @ApiModelProperty(value = "鎶ユ鏃ユ湡", example = "2023-08-29", required = true, dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inspectionDate;
- @ApiModelProperty(value = "妫�楠屼汉")
+ @ApiModelProperty(value = "妫�楠屼汉", example = "鏉庡崕", required = true)
private String surveyor;
- @ApiModelProperty(value = "妫�楠屾棩鏈�")
+ @ApiModelProperty(value = "妫�楠屾棩鏈�", required = true, example = "2023-08-29", dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateSurvey;
- @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�")
+ @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�", required = true, example = "1")
private Integer type;
- // @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
index f022a88..29be66d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
@@ -32,4 +32,7 @@
List<Map<String, Object>> selectRawmaAll();
+ Integer insertRawMaterial(RawMaterial rawMaterial);
+
+ Integer deleteRawMaterial(String deleteId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
index b72eba2..8c0c4a1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
@@ -1,6 +1,7 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
@@ -31,7 +32,6 @@
* 鍒嗛〉鏌ヨ
* @param materialCoding
* @param materialName
- * @param condition
* @param createTime
* @param page
* @return
@@ -51,5 +51,18 @@
return rawMaterialMapper.selectRawmaAll();
}
+ @Override
+ public Integer insertRawMaterial(RawMaterial rawMaterial) {
+ return rawMaterialMapper.insert(rawMaterial);
+ }
+
+ @Override
+ public Integer deleteRawMaterial(String deleteId) {
+ LambdaUpdateWrapper<RawMaterial> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(RawMaterial::getId, deleteId);
+ updateWrapper.set(RawMaterial::getState, 0);
+ return rawMaterialMapper.update(new RawMaterial(), updateWrapper);
+ }
+
}
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 85cf887..f2dc523 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: 500
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
--
Gitblit v1.9.3