From 4b9dc71d162f3fcd79bc88b170154b7516fc4962 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 18 十二月 2025 13:37:14 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件
---
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 9c92254..06b8c1d 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -4,6 +4,11 @@
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.dto.StorageBlobDTO;
+import com.ruoyi.basic.pojo.StorageAttachment;
+import com.ruoyi.basic.service.StorageAttachmentService;
+import com.ruoyi.common.constant.StorageAttachmentConstants;
+import com.ruoyi.common.enums.StorageAttachmentRecordType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
@@ -12,13 +17,14 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@@ -28,6 +34,8 @@
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
+ @Autowired
+ private StorageAttachmentService storageAttachmentService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -36,8 +44,11 @@
}
@Override
- public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
+ public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
boolean save = this.save(deviceMaintenance);
+ storageAttachmentService.saveStorageAttachmentByStorageBlob(deviceMaintenance.getFiles(),
+ deviceMaintenance.getId(), StorageAttachmentRecordType.DeviceMaintenanceImage,
+ StorageAttachmentConstants.StorageAttachmentImage);
if (save){
return AjaxResult.success();
}
@@ -45,8 +56,11 @@
}
@Override
- public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
+ public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
if (this.updateById(deviceMaintenance)) {
+ storageAttachmentService.saveStorageAttachmentByStorageBlob(deviceMaintenance.getFiles(),
+ deviceMaintenance.getId(), StorageAttachmentRecordType.DeviceMaintenanceImage,
+ StorageAttachmentConstants.StorageAttachmentImage);
return AjaxResult.success();
}
return AjaxResult.error();
@@ -54,17 +68,13 @@
@Override
public void export(HttpServletResponse response, Long[] ids) {
- ArrayList<Long> arrayList = new ArrayList<>();
- Arrays.stream(ids).map(id -> {
- return arrayList.add( id);
- });
- List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectBatchIds(arrayList);
+ List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectList(null);
ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceMaintenance -> {
+ supplierManageList.forEach(deviceMaintenance -> {
DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : "瀹岀粨");
- deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
+ deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
});
@@ -74,7 +84,13 @@
@Override
public DeviceMaintenanceDto detailById(Long id) {
-
- return deviceMaintenanceMapper.detailById(id);
+ DeviceMaintenanceDto deviceMaintenanceDto = deviceMaintenanceMapper.detailById(id);
+ List<StorageAttachment> storageAttachments = storageAttachmentService.selectStorageAttachments(id, StorageAttachmentRecordType.DeviceMaintenanceImage,
+ StorageAttachmentConstants.StorageAttachmentImage);
+ if (CollectionUtils.isNotEmpty(storageAttachments)) {
+ List<StorageBlobDTO> storageBlobs = storageAttachments.stream().map(StorageAttachment::getStorageBlobDTO).collect(Collectors.toList());
+ deviceMaintenanceDto.setFiles(storageBlobs);
+ }
+ return deviceMaintenanceDto;
}
}
--
Gitblit v1.9.3