From 32ba5ac318edf01cccc7b4d8827c4c1dc9c90f30 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 04 三月 2025 10:08:43 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
index a4af938..f9d4d7f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java
@@ -41,9 +41,9 @@
private DeviceOperationInstructionService deviceOperationInstructionService;
- @ApiOperation(value = "浣滀笟鎸囧涔� 鍒嗛〉")
+ @ApiOperation(value = "浣滀笟鎸囧涔﹀垎椤�")
@GetMapping("/pageByPageQueryOfHomeworkInstructions")
- public Result<IPage<DeviceInstruction>> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto){
+ public Result<IPage<DeviceOperationInstructionDto>> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto){
return Result.success(deviceInstructionService.pageByPageQueryOfHomeworkInstructions(page, operationInstructionDto));
}
@@ -54,7 +54,7 @@
return Result.success();
}
- @ApiOperation(value = "浣滀笟鎸囧涔︾紪杈�")
+ @ApiOperation(value = "浣滀笟鎸囧涔﹁鎯�")
@GetMapping("/homeworkGuidebookEditor")
public Result<Map<String, Object>> homeworkGuidebookEditor(Integer instructionId){
DeviceInstruction instruction = deviceInstructionService.getById(instructionId);
@@ -66,7 +66,7 @@
}
@ApiOperation(value = "浣滀笟鎸囧涔﹀彈鎺ф枃浠跺垹闄�")
- @GetMapping("/deleteHomeworkGuidebook")
+ @DeleteMapping("/deleteHomeworkGuidebook")
public Result deleteHomeworkGuidebook(String ids){
if (ObjectUtils.isNotEmpty(ids)) {
String[] idArray = ids.split(",");
@@ -76,7 +76,7 @@
}
@ApiOperation(value = "浣滀笟鎸囧涔﹀垹闄�")
- @GetMapping("/homeworkGuidebook")
+ @DeleteMapping("/homeworkGuidebook")
public Result homeworkGuidebook(String id, String instructionId){
// 鍒犻櫎瀛愯〃鏁版嵁
deviceOperationInstructionService.removeById(id);
@@ -91,8 +91,10 @@
}
@ApiOperation(value = "浣滀笟鎸囧涔﹀鎵�")
- @GetMapping("/approvalOfHomeworkInstructionManual")
- public Result approvalOfHomeworkInstructionManual(String id, Boolean status){
+ @PostMapping("/approvalOfHomeworkInstructionManual")
+ public Result approvalOfHomeworkInstructionManual(@RequestBody Map<String,Object> map){
+ Integer id =(Integer) map.get("id");
+ Boolean status =(Boolean) map.get("status");
deviceOperationInstructionService.update(Wrappers.<OperationInstruction>lambdaUpdate()
.eq(OperationInstruction::getId, id)
.set(OperationInstruction::getStatus, status)
--
Gitblit v1.9.3