From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 51 ++-------------------------------------------------
1 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index ae95e8a..ac7a176 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -21,7 +21,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->瑙勬牸-->鏌ョ湅-->鐖�-->瀛�")
+@Api(tags = "鏍囧噯搴�-->4銆侀」鐩�")
@RestController
@RequestMapping("/product")
public class ProductController {
@@ -29,44 +29,7 @@
@Autowired
private ProductService productService;
- @ApiOperation("娴嬭瘯鏍囧噯妯″潡-->娣诲姞娴嬭瘯鏍囧噯")
- @PostMapping("/add")
- public Result<?> addProductInformation(@RequestHeader("X-Token") String token, @RequestBody Product product) throws Exception {
- Object userMessage = RedisUtil.get(token);
- if (!ObjectUtils.isEmpty(userMessage)){
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(userMessage), Map.class);
- product.setUserId(Integer.parseInt(unmarshal.get("id").toString()));
- } else {
- return Result.fail("瀵逛笉璧凤紝Token閿欒!");
- }
- Integer isProductSuccess = productService.addProductInformation(product);
- if (isProductSuccess == 1) {
- return Result.success("娣诲姞鐗╂枡銆�"+ product.getName() +"銆戞垚鍔燂紒");
- }
- return Result.fail("娣诲姞鐗╂枡銆�"+ product.getName() +"銆戝け璐ワ紒");
- }
-
- @ApiOperation("鐗╂枡搴�-->鏍规嵁鐗╂枡ID鏌ヨ鎵�鏈夋祴璇曟爣鍑�")
- @GetMapping("/list")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
- })
- public Result<?> getListProductInformation(String materialId) {
- List<Map<String, Object>> listMaterialInformation = productService.getListProductInformation(materialId);
- return Result.success(listMaterialInformation);
- }
-
- @ApiOperation("鐗╂枡搴�-->鏍规嵁娴嬭瘯鏍囧噯ID鏌ヨ鍩烘湰淇℃伅")
- @GetMapping("/productId")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
- })
- public Result<?> getProductInformation(Integer productId) {
- Map<String, Object> productInformation = productService.getProductInformation(productId);
- return Result.success(productInformation);
- }
-
- @ApiOperation("鐗╂枡搴�-->鍒犻櫎娴嬭瘯鏍囧噯妯″潡鏁版嵁")
+ @ApiOperation("鍒犻櫎娴嬭瘯鏍囧噯妯″潡鏁版嵁")
@DeleteMapping("/delete")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
@@ -77,15 +40,5 @@
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
- }
-
- @ApiOperation("鐗╂枡搴�-->鏍规嵁娴嬭瘯鏍囧噯Id淇敼鏁版嵁")
- @PutMapping("/update")
- public Result<?> updateMaterialInformation(@RequestBody Product product) {
- Integer isUpdateMaterialSuccess = productService.updateMaterialInformation(product);
- if (isUpdateMaterialSuccess == 1) {
- return Result.success("淇敼銆�"+ product.getName() +"銆戞垚鍔燂紒");
- }
- return Result.fail("淇敼銆�"+ product.getName() +"銆戝け璐ワ紒");
}
}
--
Gitblit v1.9.3