From db64926ed340724ecbb0e26212c419a487eede7b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 03 四月 2025 11:23:19 +0800
Subject: [PATCH] 设备导入优化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
index 030fd98..a649d17 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
@@ -70,29 +70,32 @@
}
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
* @param standardProductListUpdateRecordRel
* @return
*/
@Override
- public IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
- return standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(page,QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+ public Map<String,Object> standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ Map<String, Object> resultMap = new HashMap<>();
+ List<StandardProductListUpdateRecordRel> recordRelList = standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+ resultMap.put("productList",recordRelList);
+ resultMap.put("total",recordRelList.size());
+ return resultMap;
}
/**
* 鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶
*
* @param file
- * @param recordId
+ * @param id
*/
@Override
- public void uploadRecordFile(MultipartFile file, Long recordId) {
+ public void uploadRecordFile(MultipartFile file, Long id) {
try {
MinioResult result = minioUtils.upload(bucketName, file, true);
// 淇濆瓨璺緞
StandardProductListUpdateRecord standardProductListUpdateRecord = new StandardProductListUpdateRecord();
- standardProductListUpdateRecord.setId(recordId);
+ standardProductListUpdateRecord.setId(id);
standardProductListUpdateRecord.setFileName(result.getOriginalName());
standardProductListUpdateRecord.setFilePath(result.getBucketFileName());
standardProductListUpdateRecord.setFilePreviewPath(result.getPreviewExpiry());
--
Gitblit v1.9.3