设备维修保养上传附件

huminmin

2026-04-28 15c1282476659d55998db571384729db9ba7146d

设备维修保养上传附件

 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java

@@ -34,7 +34,7 @@

    @PostMapping()
    @Operation(summary = "添加设备保养")
    public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
    public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
        deviceMaintenance.setDeviceName(byId.getDeviceName());
        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -49,7 +49,7 @@

    @PutMapping ()
    @Operation(summary = "修改设备保养")
    public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
    public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
        deviceMaintenance.setDeviceName(byId.getDeviceName());
        deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -58,7 +58,7 @@

    @PostMapping ("maintenance")
    @Operation(summary = "修改设备保养")
    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
    public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
    }


 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -30,27 +30,26 @@

    @PostMapping()
    @Operation(summary = "添加设备报修")
    public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
        return deviceRepairService.saveDeviceRepair(deviceRepairDto);
    }

    @Operation(summary = "根据id查询设备报修")
    @GetMapping("/{id}")
    public AjaxResult detail(@PathVariable Long id) {
        DeviceRepairDto byId = deviceRepairService.detailById(id);
        return AjaxResult.success(byId);
        return AjaxResult.success(deviceRepairService.detailById(id));
    }

    @PutMapping ()
    @Operation(summary = "修改设备报修")
    public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
        return deviceRepairService.updateDeviceRepair(deviceRepairDto);
    }

    @PostMapping ("repair")
    @Operation(summary = "设备维修")
    public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
        return deviceRepairService.updateDeviceRepair(deviceRepairDto);
    }

    @DeleteMapping("/{ids}")

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

@Data
public class DeviceMaintenanceDto extends DeviceMaintenance {
@@ -47,5 +49,9 @@

    @Schema(description = "创建人名称")
    private String createUserName;

    @Schema(description = "保养图片")
    private List<StorageBlobDTO> storageBlobDTOs;

}


 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -1,8 +1,11 @@
package com.ruoyi.device.dto;

import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.util.List;

@Data
public class DeviceRepairDto extends DeviceRepair {
@@ -12,4 +15,6 @@

    @Schema(description = "维修时间字符串")
    private String maintenanceTimeStr;

    private List<StorageBlobDTO> storageBlobDTOs;
}

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
@@ -16,7 +17,7 @@

    IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);

    DeviceMaintenanceDto detailById(Long id);
    DeviceMaintenanceVo detailById(Long id);

    @InterceptorIgnore(tenantLine = "true")
    List<DeviceMaintenance> list1(Long id);

 src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java

@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.vo.DeviceRepairVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);
    IPage<DeviceRepairVo> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);

    DeviceRepairDto detailById(Long id);
    DeviceRepairVo detailById(Long id);
}

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -37,7 +37,7 @@
    @Schema(description = "最后执行时间")
    private LocalDateTime lastExecutionTime;

    @Schema(description = "设备类目")
    @Schema(description = "设备项目")
    private String machineryCategory;



 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -34,8 +34,8 @@

    @Schema(description = "报修内容")
    private String remark;
    
    @Schema(description = "设备类目")

    @Schema(description = "设备项目")
    private String machineryCategory;



 src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.framework.web.domain.AjaxResult;

import jakarta.servlet.http.HttpServletResponse;
@@ -13,11 +14,11 @@

    IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);

    AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance);
    AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);

    AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance);
    AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);

    void export(HttpServletResponse response, Long[] ids);

    DeviceMaintenanceDto detailById(Long id);
    DeviceMaintenanceVo detailById(Long id);
}

 src/main/java/com/ruoyi/device/service/IDeviceRepairService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;

import jakarta.servlet.http.HttpServletResponse;
@@ -12,13 +13,13 @@

public interface IDeviceRepairService extends IService<DeviceRepair> {

    IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto);
    IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);

    AjaxResult saveDeviceRepair(DeviceRepair deviceRepair);
    AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto);

    AjaxResult updateDeviceRepair(DeviceRepair deviceRepair);
    AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto);

    void export(HttpServletResponse response, Long[] ids);

    DeviceRepairDto detailById(Long id);
    DeviceRepairVo detailById(Long id);
}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
@@ -11,6 +13,8 @@
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
@@ -34,6 +38,7 @@
    private final DeviceMaintenanceMapper deviceMaintenanceMapper;
    private final SparePartsMapper sparePartsMapper;
    private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
    private final FileUtil fileUtil;

    @Override
    public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -42,9 +47,12 @@
    }

    @Override
    public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
        boolean save = this.save(deviceMaintenance);
        if (save){
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
            return AjaxResult.success();
        }
        return AjaxResult.error();
@@ -52,7 +60,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
    public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
        DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
        // å¤„理备件使用情况
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
@@ -88,6 +96,8 @@
        }

        if (this.updateById(deviceMaintenance)) {
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
            return AjaxResult.success();
        }
        return AjaxResult.error();
@@ -109,8 +119,9 @@
    }

    @Override
    public DeviceMaintenanceDto detailById(Long id) {

        return deviceMaintenanceMapper.detailById(id);
    public DeviceMaintenanceVo detailById(Long id) {
        DeviceMaintenanceVo vo = deviceMaintenanceMapper.detailById(id);
        vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_MAINTENANCE, id));
        return vo;
    }
}

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -15,6 +18,7 @@
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
@@ -42,33 +46,40 @@
    private final IDeviceLedgerService deviceLedgerService;
    private final SparePartsMapper sparePartsMapper;
    private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
    private final FileUtil fileUtil;

    @Override
    public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {

        return deviceRepairMapper.queryPage(page, deviceRepairDto);
    }

    @Override
    public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        deviceRepair.setDeviceName(byId.getDeviceName());
        deviceRepair.setDeviceModel(byId.getDeviceModel());
        boolean save = this.save(deviceRepair);
        if (save){
            return AjaxResult.success();
    public IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
        IPage<DeviceRepairVo> pageDto = deviceRepairMapper.queryPage(page, deviceRepairDto);
        for (DeviceRepairVo vo : pageDto.getRecords()) {
           vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_REPAIR, vo.getId()));
        }
        return AjaxResult.error();
        return pageDto;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
        DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
    public AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
        deviceRepairDto.setDeviceName(byId.getDeviceName());
        deviceRepairDto.setDeviceModel(byId.getDeviceModel());
        boolean save = this.save(deviceRepairDto);
        if (save) {
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, deviceRepairDto.getId(), deviceRepairDto.getStorageBlobDTOs());
            return AjaxResult.success();
        }
        return AjaxResult.error("保存失败");
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
        DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
        // å¤„理备件使用情况
        if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
        if (CollectionUtils.isNotEmpty(deviceRepairDto.getSparePartsUseList())) {
            List<Long> sparePartIds = new ArrayList<>();
            for (DeviceRepair.SparePartUse sparePartUse : deviceRepair.getSparePartsUseList()) {
            for (DeviceRepairDto.SparePartUse sparePartUse : deviceRepairDto.getSparePartsUseList()) {
                // èŽ·å–备件信息
                SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
                if (spareParts != null) {
@@ -82,7 +93,7 @@
                        // åˆ›å»ºå¤‡ä»¶é¢†ç”¨è®°å½•
                        SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
                        record.setSourceType(0); // 0 ç»´ä¿®
                        record.setSourceId(deviceRepair.getId());
                        record.setSourceId(deviceRepairDto.getId());
                        record.setDeviceLedgerId(oldDeviceRepair.getDeviceLedgerId());
                        record.setSparePartsId(sparePartUse.getId());
                        record.setQuantity(sparePartUse.getQuantity());
@@ -94,12 +105,12 @@
            }
            // æ›´æ–°å¤‡ä»¶IDs字段
            if (!sparePartIds.isEmpty()) {
                deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
                deviceRepairDto.setSparePartsIds(StringUtils.join(sparePartIds, ","));
            }
        }

        if (this.updateById(deviceRepair)) {
            Long id = deviceRepair.getId();
        if (this.updateById(deviceRepairDto)) {
            Long id = deviceRepairDto.getId();
            //
            DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
            deviceDefectRecordDto.setDeviceLedgerId(id);
@@ -111,6 +122,8 @@
                    deviceDefectRecordService.updateByDDR(deviceDefectRecord);
                });
            }
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, id, deviceRepairDto.getStorageBlobDTOs());
            return AjaxResult.success();
        }
        return AjaxResult.error();
@@ -151,9 +164,10 @@
    }

    @Override
    public DeviceRepairDto detailById(Long id) {

        return deviceRepairMapper.detailById(id);
    public DeviceRepairVo detailById(Long id) {
        DeviceRepairVo vo = deviceRepairMapper.detailById(id);
        vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_REPAIR, id));
        return vo;
    }

}

 src/main/java/com/ruoyi/device/vo/DeviceMaintenanceVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.ruoyi.device.vo;

import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

@Data
public class DeviceMaintenanceVo extends DeviceMaintenance {
    @Schema(description = "设备保养id")
    private Long id;

    @Schema(description = "设备台账id")
    private Long deviceLedgerId;

    @Schema(description = "设备名称")
    private String deviceName;

    @Schema(description = "规格型号")
    private String deviceModel;

    @Schema(description = "实际保养人")
    private String maintenanceActuallyName;

    @Schema(description = "保养结果 0 ç»´ä¿® 1 å®Œå¥½")
    private String maintenanceResult;

    @Schema(description = "状态 0 å¾…保养 1 å®Œç»“ 2 å¤±è´¥")
    private Integer status;

    @Schema(description = "创建时间")
    private LocalDateTime createTime;

    @Schema(description = "更新时间")
    private LocalDateTime updateTime;

    @Schema(description = "更新人")
    private String updateUserName;

    @Schema(description = "租户id")
    private Long tenantId;

    @Schema(description = "创建人名称")
    private String createUserName;

    @Schema(description = "保养图片列表")
    private List<StorageBlobVO> storageBlobVOs;
}

 src/main/java/com/ruoyi/device/vo/DeviceRepairVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.device.vo;

import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.device.pojo.DeviceRepair;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.util.List;

@Data
public class DeviceRepairVo extends DeviceRepair {

    @Schema(description = "报修时间字符串")
    private String repairTimeStr;

    @Schema(description = "维修时间字符串")
    private String maintenanceTimeStr;

    private List<StorageBlobVO> storageBlobVOs;
}

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -51,7 +51,7 @@
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
        select dm.id,
               dm.device_ledger_id,
               dm.maintenance_plan_time,

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -5,7 +5,7 @@

<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
    <select id="queryPage" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
@@ -51,7 +51,7 @@
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceRepairVo">
        select dr.id,
               dr.device_ledger_id,
               dr.repair_time,