From c21cb3d8cebd9cdef4df2efa372c5b9257c713e4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:40 +0800
Subject: [PATCH] feat(device,supply,satisfaction): 设备计划后端改造、耗材存放位置与满意度照片支持
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 58dd316..e0aafdd 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -2,12 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
-import com.ruoyi.device.service.DeviceMaintenancePlanService;
import com.ruoyi.device.service.DeviceMaintenanceService;
-import com.ruoyi.system.mapper.UserMapper;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,12 +22,6 @@
@Autowired
private DeviceMaintenanceService deviceMaintenanceService;
-
- @Autowired
- private UserMapper userMapper;
-
- @Autowired
- private DeviceMaintenancePlanService deviceMaintenancePlanService;
/**
@@ -53,18 +44,16 @@
@Operation(summary = "鏂板淇敼璁惧缁存姢淇濆吇")
@PostMapping("/addDeviceMaintenance")
public Result addDeviceMaintenance(@RequestBody DeviceMaintenance deviceMaintenance){
- if (deviceMaintenance.getDeviceId() == null) {
- throw new RuntimeException("缂哄皯璁惧id");
- }
- User user = userMapper.selectById(deviceMaintenance.getMaintenanceUserId());
- deviceMaintenance.setMaintenanceUserName(user.getName());
+ return Result.success(deviceMaintenanceService.saveDeviceMaintenance(deviceMaintenance));
+ }
- boolean saved = deviceMaintenanceService.saveOrUpdate(deviceMaintenance);
- // 淇濆吇瀹屾垚鍚庯紝鎶婅澶囨。妗堢殑鏈�杩�/涓嬫淇濆吇鏃ユ湡婊氬姩鍒版湰杞�
- if (saved && deviceMaintenance.getMaintenanceDate() != null) {
- deviceMaintenancePlanService.updateDeviceMaintenanceDate(deviceMaintenance.getDeviceId(), deviceMaintenance.getMaintenanceDate());
- }
- return Result.success(saved);
+ /**
+ * 瀹℃牳淇濆吇璁板綍
+ */
+ @Operation(summary = "瀹℃牳淇濆吇璁板綍")
+ @PostMapping("/reviewDeviceMaintenance")
+ public Result reviewDeviceMaintenance(@RequestBody DeviceMaintenanceDto deviceMaintenanceDto) {
+ return Result.success(deviceMaintenanceService.reviewDeviceMaintenance(deviceMaintenanceDto));
}
/**
@@ -75,7 +64,7 @@
@Operation(summary = "鍒犻櫎淇敼璁惧缁存姢淇濆吇")
@DeleteMapping("/deleteDeviceMaintenance")
public Result deleteDeviceMaintenance(Integer id){
- return Result.success(deviceMaintenanceService.removeById(id));
+ return Result.success(deviceMaintenanceService.deleteDeviceMaintenance(id));
}
/**
--
Gitblit v1.9.3