From 833035bc5026f12acb8f7e1428280d0a9f204b08 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 15 一月 2025 14:37:03 +0800
Subject: [PATCH] 设备特殊字符管理 工步新增字段
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
index 26fc326..cb9ec31 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -32,16 +33,18 @@
/**
* 璁惧鐗规畩瀛楃鍒嗛〉鏌ヨ
- * @param page
- * @param size
+ * @param pageNo
+ * @param pageSize
* @param deviceCharactersRequest
* @return
*/
@AutoLog(value = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鐗规畩瀛楃-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping("/find/page/{page}/{size}")
- public QueryPageResponseResult<DeviceCharacters> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, DeviceCharactersRequest deviceCharactersRequest) {
- return iDeviceCharactersService.findByPageList(page, size, deviceCharactersRequest);
+ @GetMapping("/find/page")
+ public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ DeviceCharactersRequest deviceCharactersRequest) {
+ return iDeviceCharactersService.findByPageList(pageNo, pageSize, deviceCharactersRequest);
}
/**
@@ -65,8 +68,8 @@
*/
@AutoLog(value = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃")
@ApiOperation(value = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃", notes = "璁惧鐗规畩瀛楃-缂栬緫璁惧鐗规畩瀛楃")
- @PutMapping("/edit/{id}")
- public ResponseResult editDefinition(@PathVariable("id") String id,@RequestBody DeviceCharacters deviceCharacters) {
+ @PutMapping("/edit")
+ public ResponseResult editDefinition(@RequestBody DeviceCharacters deviceCharacters) {
boolean b = iDeviceCharactersService.updateById(deviceCharacters);
if(b) {
return new ResponseResult(CommonCode.SUCCESS);
--
Gitblit v1.9.3