From 4f3a98f19143865cdc1de4791e8a95d96bd40c65 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期五, 01 八月 2025 13:27:59 +0800 Subject: [PATCH] yys 密码已重置 --- cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 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 new file mode 100644 index 0000000..207c170 --- /dev/null +++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceInstructionController.java @@ -0,0 +1,105 @@ +package com.ruoyi.device.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.device.dto.DeviceInstructionDto; +import com.ruoyi.device.dto.DeviceOperationInstructionDto; +import com.ruoyi.device.pojo.DeviceInstruction; +import com.ruoyi.device.pojo.OperationInstruction; +import com.ruoyi.device.service.DeviceInstructionService; +import com.ruoyi.device.service.DeviceOperationInstructionService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * <p> + * 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 鍓嶇鎺у埗鍣� + * </p> + * + * @author + * @since 2024-12-04 10:29:18 + */ +@RestController +@RequestMapping("/deviceInstruction") +public class DeviceInstructionController { + + @Autowired + private DeviceInstructionService deviceInstructionService; + + @Autowired + private DeviceOperationInstructionService deviceOperationInstructionService; + + + @ApiOperation(value = "浣滀笟鎸囧涔﹀垎椤�") + @GetMapping("/pageByPageQueryOfHomeworkInstructions") + public Result<IPage<DeviceOperationInstructionDto>> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto){ + return Result.success(deviceInstructionService.pageByPageQueryOfHomeworkInstructions(page, operationInstructionDto)); + } + + @ApiOperation(value = "浣滀笟鎸囧涔︽柊澧�") + @PostMapping("/newHomeworkGuidebookAdded") + public Result newHomeworkGuidebookAdded(@RequestBody DeviceInstructionDto instructionDto){ + deviceInstructionService.newHomeworkGuidebookAdded(instructionDto); + return Result.success(); + } + + @ApiOperation(value = "浣滀笟鎸囧涔﹁鎯�") + @GetMapping("/homeworkGuidebookEditor") + public Result<Map<String, Object>> homeworkGuidebookEditor(Integer instructionId){ + DeviceInstruction instruction = deviceInstructionService.getById(instructionId); + List<DeviceOperationInstructionDto> list = deviceOperationInstructionService.homeworkGuidebookEditor(instructionId); + HashMap<String, Object> map = new HashMap<>(); + map.put("list", list); + map.put("instruction", instruction); + return Result.success(map); + } + + @ApiOperation(value = "浣滀笟鎸囧涔﹀彈鎺ф枃浠跺垹闄�") + @DeleteMapping("/deleteHomeworkGuidebook") + public Result deleteHomeworkGuidebook(String ids){ + if (ObjectUtils.isNotEmpty(ids)) { + String[] idArray = ids.split(","); + deviceOperationInstructionService.removeBatchByIds(Arrays.asList(idArray)); + } + return Result.success(); + } + + @ApiOperation(value = "浣滀笟鎸囧涔﹀垹闄�") + @DeleteMapping("/homeworkGuidebook") + public Result homeworkGuidebook(String id, String instructionId){ + // 鍒犻櫎瀛愯〃鏁版嵁 + deviceOperationInstructionService.removeById(id); + // 濡傛灉瀛愯〃鏁版嵁涓虹┖ + long count = deviceOperationInstructionService.count(Wrappers.<OperationInstruction>lambdaQuery() + .eq(OperationInstruction::getInstructionId, instructionId)); + // 閭d箞灏卞垹闄ょ埗琛ㄦ暟鎹� + if (count < 1) { + deviceInstructionService.removeById(id); + } + return Result.success(); + } + + @ApiOperation(value = "浣滀笟鎸囧涔﹀鎵�") + @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) + .set(OperationInstruction::getApproverId, SecurityUtils.getUserId().intValue()) + .set(OperationInstruction::getEntryIntoForceTime, LocalDateTime.now())); + return Result.success(); + } +} -- Gitblit v1.9.3