feat(device,supply,satisfaction): 设备计划后端改造、耗材存放位置与满意度照片支持

吴羡

2026-10-28 c21cb3d8cebd9cdef4df2efa372c5b9257c713e4

 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");
        return Result.success(deviceMaintenanceService.saveDeviceMaintenance(deviceMaintenance));
        }
        User user = userMapper.selectById(deviceMaintenance.getMaintenanceUserId());
        deviceMaintenance.setMaintenanceUserName(user.getName());

        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));
    }

    /**