From 8ae611538a5dfd3ad2872e5b1043376d1aa19a29 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 26 Mar 2021 17:34:15 +0800
Subject: [PATCH] 包裹图片长宽返回

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index f1b2906..ef3f18a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.models.auth.In;
+import org.springblade.jfpt.animalheat.util.ImageUtil;
 import org.springblade.jfpt.parcel.service.ParcelService;
 import org.springblade.jfpt.parcel.util.DateUtils;
 import org.springblade.jfpt.parcel.util.HttpClientUtils;
@@ -308,7 +309,7 @@
 	 * @return
 	 */
 	@Override
-	public Map<String, String> getParcelPic(String imgUrl) {
+	public Map<String, Object> getParcelPic(String imgUrl) {
 		//截取图片imgKey信息
 		String[] imgKeys = imgUrl.split("=", imgUrl.length());
 		String imgKey = imgKeys[1];
@@ -317,8 +318,12 @@
 		map.put("imgKey",imgKey);
 		//执行http远程调用
 		String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
-		map.put("imgBase64",s);
-		return map;
+		//获取图片的长宽
+		Map<String, Object> imageMap = ImageUtil.getBase64ImageWidthAndHeight(s);
+		//封装数据
+		imageMap.put("imgBase64",s);
+		//返回
+		return imageMap;
 	}
 
 	/**

--
Gitblit v1.9.3