From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 47 ++++++++---------------------------------------
1 files changed, 8 insertions(+), 39 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 40cb0d0..1d40de1 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import io.swagger.models.auth.In;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.util.DateUtils;
import org.springblade.jfpt.parcel.util.HttpClientUtils;
@@ -39,6 +40,9 @@
@Value("${PARCEL_DETAIL_RUL}")
private String PARCEL_DETAIL_RUL;
+
+ @Value("${PARCEL_KIND_URL}")
+ private String PARCEL_KIND_URL;
@@ -336,45 +340,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) {
- //提取违禁品数据
- List<Object> dataList = JSON.parseArray(result.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;
}
@@ -407,7 +376,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