From 434aac7e177dc414131d87bd1b23ecfce1fc8c55 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 23 二月 2020 16:16:19 +0800
Subject: [PATCH] 素材大图
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index ddd676b..18ed939 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.dynamic;
+import java.awt.image.BufferedImage;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -10,6 +11,7 @@
import java.util.UUID;
import javax.annotation.Resource;
+import javax.imageio.ImageIO;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.task.TaskExecutor;
@@ -18,8 +20,6 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.tencentcloud.COSManager;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.dao.dynamic.GoodsEvaluateDao;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.dynamic.CommentInfo;
import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
-import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.dynamic.SimpleGoods;
@@ -209,7 +208,11 @@
if (StringUtil.isNullOrEmpty(videoUrl)) {
throw new GoodsEvaluateException(1, "瑙嗛閾炬帴涓嶈兘涓虹┖");
}
-
+ InputStream inputStream = filevideo.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ int width = sourceImg.getWidth();
+ int height = sourceImg.getHeight();
+
String picLink = uploadPicture(filevideo);
if (imgVideo != null) {
String url = imgVideo.getUrl();
@@ -221,8 +224,6 @@
} else {
imgVideo = new ImgInfo();
imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
- imgVideo.setW(1);
- imgVideo.setH(1);
imgVideo.setLarge(true);
imgVideo.setPid(pid);
imgVideo.setUrl(picLink);
@@ -230,6 +231,8 @@
imgVideo.setVideoUrl(videoUrl);
imgVideo.setType(ImgEnum.video);
}
+ imgVideo.setW(width);
+ imgVideo.setH(height);
}
}
@@ -276,6 +279,11 @@
picNum = 1;
}
+ GoodsDetailVO goodsDetailVO = getGoodsDetailVO(goodsId, goodsType);;
+ if (goodsDetailVO == null) {
+ throw new GoodsEvaluateException(1, "璇ュ晢鍝佷俊鎭笉瀛樺湪");
+ }
+
if (listpic != null && listpic.size() > 0) {
for (int i = 0; i < listpic.size(); i++) {
ImgInfo imgInfo0 = new ImgInfo();
@@ -289,20 +297,16 @@
if (picNum - 1 == i) {
imgInfo0.setType(ImgEnum.goods);
- // 鍟嗗搧淇℃伅
- GoodsDetailVO goodsDetailVO = getGoodsDetailVO(goodsId, goodsType);
- if (goodsDetailVO == null) {
- throw new GoodsEvaluateException(1, "璇ュ晢鍝佷俊鎭笉瀛樺湪");
- }
-
SimpleGoods simpleGoods = new SimpleGoods();
simpleGoods.setGoodsId(goodsId);
simpleGoods.setGoodsType(goodsType);
simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
if (couponInfo == null) {
+ simpleGoods.setPrice(goodsDetailVO.getZkPrice());
simpleGoods.setState(1);
} else {
+ simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
simpleGoods.setAmount(couponInfo.getAmount());
simpleGoods.setState(0);
}
@@ -330,6 +334,7 @@
}
// 淇濆瓨鍥剧墖淇℃伅
+ resultObj.setGoods(goodsDetailVO);
resultObj.setMainPicNum(picNum);
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
@@ -404,6 +409,11 @@
throw new GoodsEvaluateException(1, "瑙嗛閾炬帴涓嶈兘涓虹┖");
}
+ InputStream inputStream = filevideo.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ int width = sourceImg.getWidth();
+ int height = sourceImg.getHeight();
+
String picLink = uploadPicture(filevideo);
if (imgVideo != null) {
String url = imgVideo.getUrl();
@@ -415,8 +425,6 @@
} else {
imgVideo = new ImgInfo();
imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
- imgVideo.setW(1);
- imgVideo.setH(1);
imgVideo.setLarge(true);
imgVideo.setPid(pid);
imgVideo.setUrl(picLink);
@@ -424,6 +432,8 @@
imgVideo.setVideoUrl(videoUrl);
imgVideo.setType(ImgEnum.video);
}
+ imgVideo.setW(width);
+ imgVideo.setH(height);
}
}
@@ -573,7 +583,7 @@
}
commentInfo.setContent(content);
commentInfo.setType(CommentInfoEnum.goodsCoupon);
- comments.add(currencyCoupon);
+ comments.add(commentInfo);
}
if (currencyCoupon != null) {
@@ -674,11 +684,18 @@
}
}
+ int width = 0;
+ int height = 0;
List<ImgInfo> listImg = new ArrayList<ImgInfo>();
if (fileRequest != null) {
MultipartFile filevideo = fileRequest.getFile("filevideo");
if (filevideo != null) {
removePicture(videoPic);
+
+ InputStream inputStream = filevideo.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ width = sourceImg.getWidth();
+ height = sourceImg.getHeight();
String picLink = uploadPicture(filevideo);
videoPic = picLink;
}
@@ -699,14 +716,19 @@
} else {
imgVideo = new ImgInfo();
imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
- imgVideo.setW(1);
- imgVideo.setH(1);
imgVideo.setLarge(true);
imgVideo.setPid(pid);
imgVideo.setUrl(videoPic);
imgVideo.setUrlHD(videoPic);
imgVideo.setVideoUrl(imgInfo.getVideoUrl());
imgVideo.setType(ImgEnum.video);
+ }
+ if (width > 0) {
+ imgVideo.setW(width);
+ imgVideo.setH(height);
+ } else {
+ imgVideo.setW(imgVideo.getW());
+ imgVideo.setH(imgVideo.getH());
}
listImg.add(imgVideo);
}
@@ -749,7 +771,8 @@
ImgInfo imgVideo = null;
List<String> listDel = new ArrayList<String>();
List<String> listOld = new ArrayList<String>();
-
+
+ List<ImgInfo> listOldImgInfo = new ArrayList<ImgInfo>();
// 澶勭悊鍥剧墖
List<ImgInfo> resultList = resultObj.getImgList();
if (resultList != null && resultList.size() > 0) {
@@ -758,6 +781,7 @@
if (type == ImgEnum.video) {
imgVideo = info;
} else if (type == ImgEnum.img) {
+ listOldImgInfo.add(info);
String url = info.getUrl();
if (!StringUtil.isNullOrEmpty(url)) {
listOld.add(url);
@@ -773,7 +797,11 @@
if (StringUtil.isNullOrEmpty(videoUrl)) {
throw new GoodsEvaluateException(1, "瑙嗛閾炬帴涓嶈兘涓虹┖");
}
-
+ InputStream inputStream = filevideo.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ int width = sourceImg.getWidth();
+ int height = sourceImg.getHeight();
+
String picLink = uploadPicture(filevideo);
if (imgVideo != null) {
String url = imgVideo.getUrl();
@@ -785,8 +813,6 @@
} else {
imgVideo = new ImgInfo();
imgVideo.setId(UUID.randomUUID().toString().replace("-", ""));
- imgVideo.setW(1);
- imgVideo.setH(1);
imgVideo.setLarge(true);
imgVideo.setPid(pid);
imgVideo.setUrl(picLink);
@@ -794,6 +820,8 @@
imgVideo.setVideoUrl(videoUrl);
imgVideo.setType(ImgEnum.video);
}
+ imgVideo.setW(width);
+ imgVideo.setH(height);
}
}
@@ -824,29 +852,38 @@
if (fileRequest != null) {
MultipartFile file = fileRequest.getFile("file" + i);
if (file != null) {
+ InputStream inputStream = file.getInputStream();
+ BufferedImage sourceImg = ImageIO.read(inputStream);
+ int width = sourceImg.getWidth();
+ int height = sourceImg.getHeight();
picLink = uploadPicture(file);
+
+ ImgInfo imgInfo0 = new ImgInfo();
+ imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
+ imgInfo0.setLarge(false);
+ imgInfo0.setPid(pid);
+ imgInfo0.setUrl(listpic.get(i));
+ imgInfo0.setUrlHD(listpic.get(i));
+ imgInfo0.setType(ImgEnum.img);
+ imgVideo.setW(width);
+ imgVideo.setH(height);
+ listImg.add(imgInfo0);
+ continue;
}
}
if (picLink.startsWith("http")) {
- listpic.add(picLink);
+ if(listOldImgInfo != null) {
+ for (ImgInfo imgInfo:listOldImgInfo) {
+ String url = imgInfo.getUrl();
+ if (picLink.equals(url)){
+ listImg.add(imgInfo);
+ break;
+ }
+ }
+ }
}
}
- }
- }
-
- if (listpic != null && listpic.size() > 0) {
- for (int i = 0; i < listpic.size(); i++) {
- ImgInfo imgInfo0 = new ImgInfo();
- imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
- imgInfo0.setW(1);
- imgInfo0.setH(1);
- imgInfo0.setLarge(false);
- imgInfo0.setPid(pid);
- imgInfo0.setUrl(listpic.get(i));
- imgInfo0.setUrlHD(listpic.get(i));
- imgInfo0.setType(ImgEnum.img);
- listImg.add(imgInfo0);
}
}
@@ -1125,3 +1162,4 @@
}
}
+
--
Gitblit v1.8.0