From 2ec6b477938b95608873feefa819c687d69c4a88 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 25 四月 2026 15:09:56 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
index d43513a..acc30a7 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java
@@ -5,12 +5,16 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.dto.StorageBlobVO;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.mapper.StorageAttachmentMapper;
import com.ruoyi.basic.mapper.StorageBlobMapper;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.service.StorageAttachmentService;
-import com.ruoyi.common.utils.MinioUtils;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
import com.ruoyi.inspectiontask.mapper.QrCodeMapper;
@@ -20,8 +24,8 @@
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -37,28 +41,23 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class QrCodeScanRecordServiceImpl extends ServiceImpl<QrCodeScanRecordMapper, QrCodeScanRecord> implements QrCodeScanRecordService {
- @Autowired
- private QrCodeScanRecordMapper qrCodeScanRecordMapper;
+ private final QrCodeScanRecordMapper qrCodeScanRecordMapper;
- @Autowired
- private QrCodeMapper qrCodeMapper;
+ private final QrCodeMapper qrCodeMapper;
- @Autowired
- private StorageAttachmentService storageAttachmentService;
+ private final StorageAttachmentService storageAttachmentService;
- @Autowired
- private StorageBlobMapper storageBlobMapper;
+ private final StorageBlobMapper storageBlobMapper;
- @Autowired
- private StorageAttachmentMapper storageAttachmentMapper;
+ private final StorageAttachmentMapper storageAttachmentMapper;
- @Autowired
- private MinioUtils minioUtils;
- @Autowired
- private SysUserMapper sysUserMapper;
+ private final SysUserMapper sysUserMapper;
+
+ private final FileUtil fileUtil;
@Override
public IPage<QrCodeScanRecordDto> selectQrCodeScanRecordList(Page<QrCodeScanRecord> page, QrCodeScanRecordDto qrCodeScanRecordDto) {
@@ -167,19 +166,15 @@
}
if (qrCodeScanRecordDto.getStorageBlobVO() != null && !qrCodeScanRecordDto.getStorageBlobVO().isEmpty()) {
- List<StorageAttachment> attachments = new ArrayList<>();
+ // vo 杞� dto
+ List<StorageBlobDTO> storageBlobDTOs = new ArrayList<>();
+ for (StorageBlobVO storageBlobVO : qrCodeScanRecordDto.getStorageBlobVO()) {
+ StorageBlobDTO storageBlobDTO = new StorageBlobDTO();
+ BeanUtils.copyProperties(storageBlobVO, storageBlobDTO);
+ storageBlobDTOs.add(storageBlobDTO);
+ }
- // todo fileChange
-// for (StorageBlobDTO storageBlobDTO : qrCodeScanRecordDto.getStorageBlobDTO()) {
-// StorageAttachment storageAttachment = new StorageAttachment(
-// StorageAttachmentFile,
-// (long) QrCodeScanRecords.ordinal(),
-// qrCodeScanRecord.getId()
-// );
-// storageAttachment.setStorageBlobDTO(storageBlobDTO);
-// attachments.add(storageAttachment);
-// }
- storageAttachmentService.saveStorageAttachment(attachments, qrCodeScanRecord.getId(), QrCodeScanRecords, StorageAttachmentFile);
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.QR_CODE_SCAN_RECORDS, qrCodeScanRecord.getId(), storageBlobDTOs);
}
return i;
}
@@ -189,4 +184,4 @@
return qrCodeScanRecordMapper.deleteBatchIds(Arrays.asList(ids));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3