From c4b9a339caff12e95f61c3d5dc950aafcc8c566c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 06 六月 2025 16:03:40 +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/BasicDataController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
index dbc54a8..818b89e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java
@@ -1,17 +1,26 @@
package com.example.erp.controller.sd;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
+import com.example.erp.entity.sd.BasicData;
import com.example.erp.service.sd.BasicDateService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@RestController
@RequestMapping("/basicData")
+@Api(value="璁㈠崟鍩虹controller",tags={"璁㈠崟鍩虹鏁版嵁鎿嶄綔鎺ュ彛"})
public class BasicDataController {
- @Autowired
+ final
BasicDateService basicDateService;
+
+ public BasicDataController(BasicDateService basicDateService) {
+ this.basicDateService = basicDateService;
+ }
+
@GetMapping("/orderBasicData")
public Result getOrderBasicData(){
return Result.seccess(basicDateService.getOrderBasicData());
@@ -20,4 +29,42 @@
public Result getBasicDataByType(@PathVariable String type){
return Result.seccess(basicDateService.getBasicDataByType(type));
}
+ @GetMapping("/BasicDataByType/{type}/{childType}")
+ public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
+ return Result.seccess(basicDateService.getBasicDataByTypeAndChildType(type,childType));
+ }
+
+
+ @ApiOperation("鏌ヨ鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.search")
+ @GetMapping("/getBasicData")
+ public Result getBasicData(){
+ return Result.seccess(basicDateService.getBasicData());
+ }
+ @ApiOperation("鏌ヨ鍩虹鏁版嵁绫诲瀷")
+ @SaCheckPermission("searchOrderBasicData.search")
+ @GetMapping("/getBasicDataType")
+ public Result getBasicDataType(){
+ return Result.seccess(basicDateService.getBasicDataType());
+ }
+
+ @ApiOperation("鏂板鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.add")
+ @PostMapping("addBasicData")
+ public Result addBasicData(@RequestBody Map<String,Object> map){
+ return Result.seccess(basicDateService.addBasicData(map));
+ }
+
+ @ApiOperation("鏇存柊鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.update")
+ @PostMapping("updateBasicData")
+ public Result updateBasicData(@RequestBody BasicData basicData){
+ return Result.seccess(basicDateService.updateBasicData(basicData));
+ }
+ @ApiOperation("鍒犻櫎鍩虹鏁版嵁")
+ @SaCheckPermission("searchOrderBasicData.delete")
+ @PostMapping("deleteBasicData")
+ public Result deleteBasicData(@RequestBody BasicData basicData){
+ return Result.seccess(basicDateService.deleteBasicData(basicData));
+ }
}
--
Gitblit v1.8.0