feat: 删除设备保修时也删除对应的上传附件

gongchunyi

6 小时以前 efd594b160a4e35f499eb54ffa0c5b06326cbe1c

feat: 删除设备保修时也删除对应的上传附件

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

@@ -64,7 +64,7 @@
    @DeleteMapping("/{ids}")
    @ApiOperation("删除设备报修")
    public AjaxResult delete(@PathVariable("ids") Long[] ids) {
        boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
        boolean b = deviceRepairService.deleteRepairAndFiles(Arrays.asList(ids));
        if (!b) {
            return AjaxResult.error("删除失败");
        }

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

@@ -10,6 +10,7 @@
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.List;


@@ -31,4 +32,6 @@

    void deleteFile(Long fileId);

    boolean deleteRepairAndFiles(Collection<Long> ids);

}

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

@@ -33,6 +33,7 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;

@@ -179,4 +180,20 @@
        }
        commonFileMapper.deleteById(fileId);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean deleteRepairAndFiles(Collection<Long> ids) {
        if (ids == null || ids.isEmpty()) {
            throw new ServiceException("删除失败,请传入要删除的数据");
        }

        List<CommonFile> fileList = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
                .in(CommonFile::getCommonId, ids)
                .eq(CommonFile::getType, FileNameType.EQUIPMENT_WARRANTY.getValue()));
        for (CommonFile commonFile : fileList) {
            deleteFile(commonFile.getId());
        }
        return this.removeBatchByIds(ids);
    }
}