gongchunyi
9 小时以前 8b1bfaac66ddcfcf4633db2b379fefffadc743ec
feat: 设备保养附件
已修改2个文件
30 ■■■■■ 文件已修改
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -10,6 +10,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
@Data
@TableName("device_maintenance")
@@ -96,4 +97,8 @@
    @ApiModelProperty("保养项目")
    private String maintenanceItems;
    @ApiModelProperty("临时文件ID列表")
    @TableField(exist = false)
    private List<String> tempFileIds;
}
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -10,10 +10,12 @@
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -28,6 +30,9 @@
    @Autowired
    private DeviceMaintenanceMapper deviceMaintenanceMapper;
    @Autowired
    private DeviceMaintenanceFileService deviceMaintenanceFileService;
    @Override
    public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -35,12 +40,26 @@
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
        // 先保存设备保养记录
        boolean save = this.save(deviceMaintenance);
        if (save) {
            return AjaxResult.success(deviceMaintenance);
        if (!save) {
            return AjaxResult.error("保存失败");
        }
        return AjaxResult.error();
        // 处理临时文件关联
        if (deviceMaintenance.getTempFileIds() != null && !deviceMaintenance.getTempFileIds().isEmpty()) {
            for (String tempId : deviceMaintenance.getTempFileIds()) {
                try {
                    deviceMaintenanceFileService.bindFromTemp(tempId, deviceMaintenance.getId().intValue(), null);
                } catch (Exception e) {
                    throw new RuntimeException("关联临时文件失败: " + e.getMessage());
                }
            }
        }
        return AjaxResult.success(deviceMaintenance);
    }
    @Override