From c0892e033a19c4a481db5d661df542e30cff3ce4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:16 +0800
Subject: [PATCH] 设备全查接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 1d40de1..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;
@@ -43,6 +44,9 @@
@Value("${PARCEL_KIND_URL}")
private String PARCEL_KIND_URL;
+
+ @Value("${PARCEL_PRE_URL}")
+ private String PARCEL_PRE_URL;
@@ -305,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];
@@ -314,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;
}
/**
@@ -325,9 +333,30 @@
*/
@Override
public Object getParcelDetailPage(ConditionVo conditionVo) {
- String result = getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result").toString();
+ Map<String,Object> result =(Map<String,Object>) getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
if (null!=result) {
- return JSONObject.parse(result);
+// List<Object> dataList = JSONArray.parseArray(result.get("data").toString());
+// System.out.println("dataList = " + dataList);
+// //遍历集合
+// for (Object data:dataList) {
+// Map<String,Object> parcelData =(Map<String,Object>)data;
+// String imgUrl = parcelData.get("imgUrl").toString();
+// //查询图片 PARCEL_PRE_URL
+// //截取图片imgKey信息
+// String[] imgKeys = imgUrl.split("=", imgUrl.length());
+// String imgKey = imgKeys[1];
+// //封装成map对象
+// HashMap<String, String> map = new HashMap<>();
+// map.put("imgKey",imgKey);
+// //执行http远程调用
+// String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
+// //封装数据
+// if (null!=s && s!="") {
+// parcelData.put("imgUrl", s);
+// }
+// }
+ return JSONObject.parse(result.toString());
+
}
return null;
}
--
Gitblit v1.9.3