From 069002eaf41d090335c851765c04d708870b6d55 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 23 二月 2020 16:53:00 +0800
Subject: [PATCH] 图片排列设置

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 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 7482a66..43b63ff 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
@@ -284,6 +284,7 @@
 			throw new GoodsEvaluateException(1, "璇ュ晢鍝佷俊鎭笉瀛樺湪");
 		}
 		
+		int totalImg = 0;
 		if (listpic != null && listpic.size() > 0) {
 			for (int i = 0; i < listpic.size(); i++) {
 				ImgInfo imgInfo0 = new ImgInfo();
@@ -315,6 +316,7 @@
 					imgInfo0.setType(ImgEnum.img);
 				}
 				listImg.add(imgInfo0);
+				totalImg ++;
 			}
 		}
 
@@ -333,7 +335,18 @@
 			}
 		}
 		
-		// 淇濆瓨鍥剧墖淇℃伅
+		int lineNum = 0;
+		if (totalImg > 0) {
+			if (totalImg == 1) {
+				lineNum = 1;
+			} else if (totalImg <= 4) {
+				lineNum = 2;
+			} else {
+				lineNum = 3;
+			}
+		}
+		
+		resultObj.setLineNum(lineNum);
 		resultObj.setGoods(goodsDetailVO);
 		resultObj.setMainPicNum(picNum);
 		resultObj.setImgList(listImg);
@@ -453,6 +466,7 @@
 			}
 		}
 
+		int totalImg = 0;
 		if (!StringUtil.isNullOrEmpty(goodsList)) {
 			String[] goodsArray = goodsList.split(",");
 			if (goodsArray != null && goodsArray.length > 0) {
@@ -494,6 +508,8 @@
 						simpleGoods.setState(0);
 					}
 					imgInfo0.setGoods(simpleGoods);
+					listImg.add(imgInfo0);
+					totalImg ++;
 				}
 			}
 		}
@@ -536,6 +552,19 @@
 			}
 		}
 
+		int lineNum = 0;
+		if (totalImg > 0) {
+			if (totalImg == 1) {
+				lineNum = 1;
+			} else if (totalImg <= 4) {
+				lineNum = 2;
+			} else {
+				lineNum = 3;
+			}
+		}
+		
+		resultObj.setLineNum(lineNum);
+		
 		// 淇濆瓨鍥剧墖淇℃伅
 		resultObj.setImgList(listImg);
 		goodsEvaluateDao.save(resultObj);
@@ -686,6 +715,8 @@
 
 		int width = 0;
 		int height = 0;
+		int width2 = 0;
+		int height2 = 0;
 		List<ImgInfo> listImg = new ArrayList<ImgInfo>();
 		if (fileRequest != null) {
 			MultipartFile filevideo = fileRequest.getFile("filevideo");
@@ -703,6 +734,10 @@
 			MultipartFile activityfile = fileRequest.getFile("activityfile");
 			if (activityfile != null) {
 				removePicture(activityPic);
+				InputStream inputStream = activityfile.getInputStream();
+				BufferedImage sourceImg = ImageIO.read(inputStream);
+				width2 = sourceImg.getWidth();
+				height2 = sourceImg.getHeight();
 				String picLink = uploadPicture(activityfile);
 				activityPic = picLink;
 			}
@@ -741,8 +776,6 @@
 			} else {
 				imgactivity = new ImgInfo();
 				imgactivity.setId(UUID.randomUUID().toString().replace("-", ""));
-				imgactivity.setW(1);
-				imgactivity.setH(1);
 				imgactivity.setLarge(true);
 				imgactivity.setPid(pid);
 				imgactivity.setUrl(activityPic);
@@ -750,8 +783,16 @@
 				imgactivity.setActivityUrl(imgInfo.getActivityUrl());
 				imgactivity.setType(ImgEnum.activity);
 			}
+			if (width2 > 0) {
+				imgactivity.setW(width2);
+				imgactivity.setH(height2);
+			} else {
+				imgactivity.setW(imgactivity.getW());
+				imgactivity.setH(imgactivity.getH());
+			}
 			listImg.add(imgactivity);
 		}
+		resultObj.setLineNum(1);
 		resultObj.setImgList(listImg);
 		goodsEvaluateDao.save(resultObj);
 	}
@@ -831,6 +872,7 @@
 				if (imgVideo != null && StringUtil.isNullOrEmpty(imgVideo.getUrl())) {
 					throw new GoodsEvaluateException(1, "瑙嗛灏侀潰鍥句笉鑳戒负绌�");
 				}
+				
 				imgVideo.setVideoUrl(videoUrl);
 				listImg.add(imgVideo);
 			} else {
@@ -901,7 +943,7 @@
 					listDel.add(listOld.get(j));
 			}
 		}
-		
+		resultObj.setLineNum(1);
 		resultObj.setImgList(listImg);
 		goodsEvaluateDao.save(resultObj);
 

--
Gitblit v1.8.0