From 32ddd9d13c53dd7fe5a09120ca59b29e61afc0cc Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 16:24:08 +0800
Subject: [PATCH] 标准库中新增区间后，保存提示报错修改
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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..d9dcf7e 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
@@ -17,6 +17,7 @@
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListUpdateRecordService;
+import com.ruoyi.common.config.MinioConfig;
import com.ruoyi.common.core.domain.MinioResult;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
@@ -55,8 +56,8 @@
@Resource
private MinioUtils minioUtils;
- @Value("${minio.bucketName}")
- private String bucketName;
+ @Autowired
+ private MinioConfig minioConfig;
/**
* 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
@@ -65,34 +66,37 @@
* @return
*/
@Override
- public IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
- return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+ public IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecordDto record) {
+ return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,record);
}
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @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);
+ MinioResult result = minioUtils.upload(minioConfig.getBucketName(), 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