From e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 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 ac7a176..31b730b 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,21 +1,22 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.Product;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.ProductService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
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.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,16 +30,38 @@
@Autowired
private ProductService productService;
- @ApiOperation("鍒犻櫎娴嬭瘯鏍囧噯妯″潡鏁版嵁")
- @DeleteMapping("/delete")
+ @ApiOperation("鏌ヨ璇ュ瀷鍙蜂笅鐨勯」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿ID", dataTypeClass = Integer.class, required = true)
})
- public Result<?> deleteProductInformation(Integer productId) {
- Integer isDeleteProduct = productService.deleteProductInformation(productId);
- if (isDeleteProduct == 1) {
- return Result.success("鍒犻櫎鎴愬姛锛�");
+ @GetMapping("/page")
+ public Result<?> pageProductInformation(Integer specificationsId) {
+ return Result.success(productService.pageProductInformation(specificationsId));
+ }
+
+ @ApiOperation("濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍囧噯椤圭洰ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/write")
+ public Result<?> write(Integer id, String required, String internal) {
+ Integer write = productService.write(id, required, internal);
+ if (write >= 1){
+ return Result.success("鏇存柊鎴愬姛");
}
- return Result.fail("鍒犻櫎澶辫触锛�");
+ return Result.fail("鏇存柊澶辫触");
+ }
+
+ @ApiOperation("椤圭洰Id鍒楄〃鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "ids", value = "鏍囧噯椤圭洰ID", dataTypeClass = String.class, required = true)
+ })
+ @DeleteMapping("/deleteList")
+ public Result<?> deleteList(String ids) {
+ MyUtil.PrintLog(ids);
+ productService.deleteList(ids);
+ return Result.success("鍒犻櫎鎴愬姛");
}
}
--
Gitblit v1.9.3