From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
index 36b9848..db640b5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
@@ -1,29 +1,50 @@
package com.example.erp.controller.sd;
import com.example.erp.common.Result;
-import com.example.erp.service.sd.BasicGlassTypeServise;
+import com.example.erp.service.sd.BasicGlassTypeService;
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.Map;
@RestController
@RequestMapping("/basicGlassType")
public class BasicGlassTypeController {
@Autowired
- BasicGlassTypeServise basicGlassTypeServise;
+ BasicGlassTypeService basicGlassTypeServise;
@GetMapping("/getOneLevel")
public Result getOneLevel(){
- return Result.seccess(basicGlassTypeServise.getOneLevel());
+ return Result.success(basicGlassTypeServise.getOneLevel());
}
@GetMapping("/getTwoLevel")
public Result getTwoLevel(){
- return Result.seccess(basicGlassTypeServise.getTwoLevel());
+ return Result.success(basicGlassTypeServise.getTwoLevel());
}
@GetMapping("/getAll")
public Result getAll(){
- return Result.seccess(basicGlassTypeServise.getAll());
+ return Result.success(basicGlassTypeServise.getAll());
}
+
+ @GetMapping("/findAll")
+ public Result findAll(){
+ return Result.success(basicGlassTypeServise.findAll());
+ }
+
+ @GetMapping("/deleteById/{id}")
+ public Result deleteById(@PathVariable Integer id){
+ return Result.success(basicGlassTypeServise.deleteById(id));
+ }
+
+ @GetMapping("/getOneLevelListMap")
+ public Result getOneLevelListMap(){
+ return Result.success(basicGlassTypeServise.getOneLevelListMap());
+ }
+
+ @PostMapping("/add")
+ public Result add(@RequestBody Map<String,Object> map){
+ return Result.success(basicGlassTypeServise.add(map));
+ }
+
}
--
Gitblit v1.8.0