From af424bbf74743aa48d1b99a4922b6fc65c81fa6c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 25 Mar 2021 20:41:25 +0800
Subject: [PATCH] 包裹详细接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 82 ++++++++++++++++------------------------
1 files changed, 33 insertions(+), 49 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 a259baf..f1b2906 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
@@ -41,6 +41,12 @@
@Value("${PARCEL_DETAIL_RUL}")
private String PARCEL_DETAIL_RUL;
+ @Value("${PARCEL_KIND_URL}")
+ private String PARCEL_KIND_URL;
+
+ @Value("${PARCEL_PRE_URL}")
+ private String PARCEL_PRE_URL;
+
/**
@@ -322,9 +328,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;
}
@@ -337,53 +364,10 @@
*/
@Override
public Object getParcelkindDetailPage(ConditionVo conditionVo) {
- conditionVo.setDecisioDiagramResult("contraband");
- Map<Object, Object> map = new HashMap<>();
- List<Object> list = new ArrayList<>();
- //获取违禁包裹数据
- Map<String,Object> result = (Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
+ //获取违禁品数据
+ String result = getParcelDataPageList(conditionVo, PARCEL_KIND_URL, PARCEL_KEY, PARCEL_SECRET).get("result").toString();
if (null!=result) {
- //获取总违禁包裹数量
- Integer totalSize = Integer.parseInt(result.get("totalSize").toString());
- int total = totalSize/conditionVo.getCurrentPage() +1 ;
- for (int i = 0;i<total;i++){
- conditionVo.setCurrentPage(i+1);
- //获取违禁包裹数据
- Map<String,Object> resultData = (Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
- //提取违禁品数据
- List<Object> dataList = JSON.parseArray(resultData.get("data").toString());
- for (Object data : dataList) {
- //取出list里面的值转为map
- Map<String, Object> objectMap = (Map<String, Object>) data;
- //获取违禁包裹名称，包裹Id,包裹图片，过机时间
- String checkMachineName = objectMap.get("checkMachineName").toString();
- String packageId = objectMap.get("packageId").toString();
- String imgUrl = objectMap.get("imgUrl").toString();
- String samplingTime = objectMap.get("samplingTime").toString();
- //获取违禁品集合数据
- List<Object> detailVoList = JSON.parseArray(objectMap.get("coordsDetailVoList").toString());
- //遍历违禁品集合数据
- for (Object detailVo : detailVoList) {
- //封装违禁包裹信息
- Map<String, Object> detailVoMap = (Map<String, Object>) detailVo;
- detailVoMap.put("checkMachineName", checkMachineName);
- detailVoMap.put("packageId", packageId);
- detailVoMap.put("imgUrl", imgUrl);
- detailVoMap.put("samplingTime", samplingTime);
- list.add(detailVoMap);
- }
- }
- }
- //对组装好的违禁品集合数据排序，按时间
- //分页
- List<Object> listPaging = PageList.getListPaging(list, conditionVo.getCurrentPage(), conditionVo.getPageSize());
- //封装数据
- map.put("totalSize", list.size());
- map.put("data", listPaging);
- map.put("currentPage", conditionVo.getCurrentPage());
- map.put("pageSize", conditionVo.getPageSize());
- //返回数据
- return map;
+ return JSONObject.parse(result);
}
return null;
}
@@ -416,7 +400,7 @@
map.put("pageSize", conditionVo.getPageSize());
}
//3.远程调用api 获取数据
- String params = HttpClientUtils.httpPost(PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET, map);
+ String params = HttpClientUtils.httpPost(url, key, secret, map);
Map<String,Object> paramsMap = (Map<String, Object>) JSONObject.parse(params);
if (paramsMap.get("succ").toString().equals("ok")){
//4返回数据
--
Gitblit v1.9.3