From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 75 +++++++++----------------------------
1 files changed, 18 insertions(+), 57 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 65e8dac..eff45e8 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,27 +1,27 @@
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.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 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "鏍囧噯搴�-->5銆佽鏍�-->鏌ョ湅-->瀛愭ā鍧�")
+@Api(tags = "鏍囧噯搴�-->4銆侀」鐩�")
@RestController
@RequestMapping("/product")
public class ProductController {
@@ -29,63 +29,24 @@
@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")
+ @ApiOperation("鏌ヨ璇ュ瀷鍙蜂笅鐨勯」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(value = "鐗╂枡ID", name = "materialId", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿ID", dataTypeClass = Integer.class, required = true)
})
- public Result<?> getListProductInformation(String materialId) {
- List<Map<String, Object>> listMaterialInformation = productService.getListProductInformation(materialId);
- return Result.success(listMaterialInformation);
+ @GetMapping("/page")
+ public Result<?> pageProductInformation(Integer specificationsId) {
+ return Result.success(productService.pageProductInformation(specificationsId));
}
- @ApiOperation("鏍规嵁娴嬭瘯鏍囧噯ID鏌ヨ鍩烘湰淇℃伅")
- @GetMapping("/productId")
+ @ApiOperation("濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨")
@ApiImplicitParams(value = {
- @ApiImplicitParam(value = "娴嬭瘯鏍囧噯ID", name = "productId", dataTypeClass = String.class)
+ @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)
})
- public Result<?> getProductInformation(Integer productId) {
- Map<String, Object> productInformation = productService.getProductInformation(productId);
- return Result.success(productInformation);
+ @PostMapping("/write")
+ public Result<?> write(Integer id, String required, String internal) {
+ return Result.success(productService.write(id, required, internal));
}
- @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("鍒犻櫎澶辫触锛�");
- }
-
- @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