feat(config): 添加新环境配置并扩展设备台账功能

云

3 天以前 4f55d3cb4bc644e4534106336f2047af1a4db5df

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

@@ -11,7 +11,9 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
@@ -36,6 +38,7 @@
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {

    private final DeviceMaintenanceMapper deviceMaintenanceMapper;
    private final IDeviceLedgerService deviceLedgerService;
    private final SparePartsMapper sparePartsMapper;
    private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
    private final FileUtil fileUtil;
@@ -49,6 +52,12 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
        DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
        if (byId != null) {
            deviceMaintenance.setDeviceName(byId.getDeviceName());
            deviceMaintenance.setDeviceModel(byId.getDeviceModel());
            deviceMaintenance.setAreaId(byId.getAreaId());
        }
        boolean save = this.save(deviceMaintenance);
        if (save){
            // 处理图片上传
@@ -62,6 +71,15 @@
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
        DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
        Long effectiveDeviceLedgerId = deviceMaintenance.getDeviceLedgerId() != null
                ? deviceMaintenance.getDeviceLedgerId()
                : oldDeviceMaintenance.getDeviceLedgerId();
        DeviceLedger byId = deviceLedgerService.getById(effectiveDeviceLedgerId);
        if (byId != null) {
            deviceMaintenance.setDeviceName(byId.getDeviceName());
            deviceMaintenance.setDeviceModel(byId.getDeviceModel());
            deviceMaintenance.setAreaId(byId.getAreaId());
        }
        // 处理备件使用情况
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
            List<Long> sparePartIds = new ArrayList<>();