From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期三, 26 七月 2023 09:16:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 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 abe2d9d..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 @@ -1,15 +1,16 @@ package com.yuanchu.limslaboratory.controller; - -import com.yuanchu.limslaboratory.pojo.SerialNumber; +import com.yuanchu.limslaboratory.pojo.Product; import com.yuanchu.limslaboratory.service.ProductService; import com.yuanchu.limslaboratory.utils.JackSonUtil; import com.yuanchu.limslaboratory.utils.RedisUtil; import com.yuanchu.limslaboratory.vo.Result; -import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -20,6 +21,7 @@ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 * @since 2023-07-17 */ +@Api(tags = "鏍囧噯搴�-->4銆侀」鐩�") @RestController @RequestMapping("/product") public class ProductController { @@ -27,4 +29,16 @@ @Autowired private ProductService productService; + @ApiOperation("鍒犻櫎娴嬭瘯鏍囧噯妯″潡鏁版嵁") + @DeleteMapping("/delete") + @ApiImplicitParams(value = { + @ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class) + }) + public Result<?> deleteProductInformation(Integer productId) { + Integer isDeleteProduct = productService.deleteProductInformation(productId); + if (isDeleteProduct == 1) { + return Result.success("鍒犻櫎鎴愬姛锛�"); + } + return Result.fail("鍒犻櫎澶辫触锛�"); + } } -- Gitblit v1.9.3