From 3bee17a52f3ee1f493048465f3e07b31c2102ee5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 23 二月 2024 16:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
index f24f2bb..420402c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -1,11 +1,14 @@
package com.example.erp.controller.sd;
import com.example.erp.common.Result;
+import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
+import org.apache.ibatis.annotations.Delete;
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.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/product")
@@ -13,9 +16,13 @@
@Autowired
ProductService productService;
- @GetMapping
- public Result defaultDateProduct(){
- //璋冪敤productService鐨刣efaultDateProduct鏂规硶锛岃繑鍥炵粨鏋�
- return Result.seccess(productService.defaultDateProduct());
+ @PostMapping ("/{pageNum}/{pageSize}/{glassType}")
+ public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
+ return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
+ }
+
+ @PostMapping("/saveProduct")
+ public Result saveProduct(@RequestBody Map<String,Object> product){
+ return Result.seccess(productService.saveProduct(product));
}
}
--
Gitblit v1.8.0