From 280c2311d855551a42fbae3287ade7fc43596013 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 10:06:04 +0800
Subject: [PATCH] 批量上传
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 8 +++++++-
server/company/src/main/java/com/doumee/api/common/PublicController.java | 3 ++-
company_admin/src/components/business/OperaGoodsWindow.vue | 13 +++++++++++--
company_admin/src/views/business/goods.vue | 2 +-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/company_admin/src/components/business/OperaGoodsWindow.vue b/company_admin/src/components/business/OperaGoodsWindow.vue
index 888e1d3..cd62c60 100644
--- a/company_admin/src/components/business/OperaGoodsWindow.vue
+++ b/company_admin/src/components/business/OperaGoodsWindow.vue
@@ -297,13 +297,22 @@
message: '鍙兘涓婁紶涓�涓浘鏍�'
})
},
+ initMuitlFiles (fileList) {
+ const list = [];
+ fileList.forEach(rawFile => {
+ list.push({ fileurl: rawFile.response.data.imgaddr, name: rawFile.response.data.imgname, url: rawFile.response.data.url })
+ });
+ return list;
+ },
fileSuccess1(response, file, fileList) {
this.form.files = fileList
- this.form.multifileList.push({ fileurl: response.data.imgaddr, name: response.data.imgname, url: response.data.url })
+ // this.form.multifileList.push({ fileurl: response.data.imgaddr, name: response.data.imgname, url: response.data.url })
+ this.form.multifileList=this.initMuitlFiles(fileList);
},
handleRemove1(file, fileList) {
this.form.files = fileList
- this.form.multifileList = fileList
+ // this.form.multifileList = fileList
+ this.form.multifileList=this.initMuitlFiles(fileList);
},
fileSuccess(response) {
this.form.ztList.push({ imgaddr: response.data.imgaddr, url: response.data.url })
diff --git a/company_admin/src/views/business/goods.vue b/company_admin/src/views/business/goods.vue
index 48e5642..bfe25e8 100644
--- a/company_admin/src/views/business/goods.vue
+++ b/company_admin/src/views/business/goods.vue
@@ -274,7 +274,7 @@
if (res.multifileList.length > 0) {
res.multifileList.forEach(item => {
obj.multifileList.push({ fileurl: item.fileurl, name: item.name, url: res.prefixUrl + item.fileurl })
- obj.files.push({ fileurl: item.fileurl, name: item.name, url: res.prefixUrl + item.fileurl })
+ obj.files.push({ fileurl: item.fileurl, name: item.name, url: res.prefixUrl + item.fileurl, response: { data: { imgaddr: item.fileurl, imgname: item.name } } })
})
}
this.$refs.operaGoodsWindow.open('缂栬緫鍟嗗搧', obj)
diff --git a/server/company/src/main/java/com/doumee/api/common/PublicController.java b/server/company/src/main/java/com/doumee/api/common/PublicController.java
index 179aca8..10c9278 100644
--- a/server/company/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/company/src/main/java/com/doumee/api/common/PublicController.java
@@ -76,9 +76,10 @@
MultipartFile file = multipartRequest.getFile(fileNames.next());
String fileName = file.getOriginalFilename();
String suffix = fileName.substring(fileName.lastIndexOf("."));
- if ( !StringUtils.equalsIgnoreCase(suffix, ".jpg") || !StringUtils.equalsIgnoreCase(suffix, ".png")) {
+ if ( !StringUtils.equalsIgnoreCase(suffix, ".jpg") && !StringUtils.equalsIgnoreCase(suffix, ".png")) {
context.put("code", 0);
context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡涓婁紶鏈夎锛�");
+ return;
}
}
upload(multipartRequest, response, folder + "/",
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 4eb812e..9c42266 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -361,6 +361,9 @@
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
Multifile multifile = multifileList.get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
multifile.setCreator(user.getId());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
@@ -1116,7 +1119,10 @@
List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
- .lambda().in(Multifile::getObjId,integerList).eq(Multifile::getType,Constants.ZERO).eq(Multifile::getObjType,Constants.ZERO));
+ .lambda().in(Multifile::getObjId,integerList)
+ .eq(Multifile::getType,Constants.ZERO)
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.ZERO));
List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
.in("GOODS_ID",integerList)
.orderByAsc(" SORTNUM "));
--
Gitblit v1.9.3