From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceTypeController.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceTypeController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceTypeController.java
index b4c02ac..d7e3e7b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceTypeController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceTypeController.java
@@ -9,10 +9,7 @@
import org.jeecg.modules.dnc.entity.DeviceType;
import org.jeecg.modules.dnc.service.IDeviceTypeService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@Slf4j
@Api(tags = "璁惧绫讳俊鎭�")
@@ -24,15 +21,15 @@
/**
* 鏍规嵁涓氬姟id鏌ヨ璁惧绫诲垪琛�
- * @param businessId
- * @param type
+ * @param attributionId
+ * @param attributionType
* @return
*/
@AutoLog(value = "璁惧绫讳俊鎭�-鏍规嵁涓氬姟id鏌ヨ璁惧绫诲垪琛�")
@ApiOperation(value = "璁惧绫讳俊鎭�-鏍规嵁涓氬姟id鏌ヨ璁惧绫诲垪琛�", notes = "璁惧绫讳俊鎭�-鏍规嵁涓氬姟id鏌ヨ璁惧绫诲垪琛�")
@GetMapping("/getByBusinessId")
- public Result<?> getByBusinessId(String businessId,String type){
- return deviceTypeService.getByBusinessId(businessId,type);
+ public Result<?> getByBusinessId(String attributionId,String attributionType){
+ return deviceTypeService.getByBusinessId(attributionId,attributionType);
}
/**
@@ -42,9 +39,9 @@
*/
@AutoLog(value = "璁惧绫讳俊鎭�-鏂板璁惧绫�")
@ApiOperation(value = "璁惧绫讳俊鎭�-鏂板璁惧绫�", notes = "璁惧绫讳俊鎭�-鏂板璁惧绫�")
- @GetMapping("/add")
- public Result<?> add(DeviceType deviceType){
- return Result.OK(deviceTypeService.add(deviceType));
+ @PostMapping("/add")
+ public Result<?> add(@RequestBody DeviceType deviceType){
+ return deviceTypeService.add(deviceType);
}
/**
@@ -54,9 +51,9 @@
*/
@AutoLog(value = "璁惧绫讳俊鎭�-缂栬緫璁惧绫�")
@ApiOperation(value = "璁惧绫讳俊鎭�-缂栬緫璁惧绫�", notes = "璁惧绫讳俊鎭�-缂栬緫璁惧绫�")
- @GetMapping("/edit")
- public Result<?> edit(DeviceType deviceType){
- return Result.OK(deviceTypeService.edit(deviceType));
+ @PutMapping("/edit")
+ public Result<?> edit(@RequestBody DeviceType deviceType){
+ return deviceTypeService.edit(deviceType);
}
/**
@@ -66,8 +63,8 @@
*/
@AutoLog(value = "璁惧绫讳俊鎭�-鏍规嵁id鍒犻櫎璁惧绫�")
@ApiOperation(value = "璁惧绫讳俊鎭�-鏍规嵁id鍒犻櫎璁惧绫�", notes = "璁惧绫讳俊鎭�-鏍规嵁id鍒犻櫎璁惧绫�")
- @GetMapping("/delete")
- public Result<?> delete(@RequestBody String id){
- return Result.OK(deviceTypeService.delete(id));
+ @DeleteMapping("/delete")
+ public Result<?> delete(String id){
+ return deviceTypeService.delete(id);
}
}
--
Gitblit v1.9.3