From 251e08cb5460b7a503541e92741cb1868164e7d2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Mar 2021 17:55:07 +0800
Subject: [PATCH] 违禁包裹统计接口Ok

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 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 8e68cb7..cb04570 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
@@ -35,8 +35,8 @@
 
 
 	/**
-	 * 获取查询条件
-	 * @param conditionVo 查询条件对象
+	 * 获取违禁包裹统计数据,远程调用接口
+	 * @param conditionVo 查询条件对象  status 状态码 0:本天    1:本周   2:本月
 	 * @return
 	 */
 	@Override
@@ -45,16 +45,32 @@
 		if (null!=conditionVo.getStatus()) {
 			//获取数据
 			List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
-			//5.遍历,分别取出数据
+			Map<String,String> mapCode = new HashMap<>();
+			//遍历集合,存储所有的违禁包裹编码
 			for (Object object : objectList) {
-				Map<String, Object> objectMap = (Map<String, Object>) object;//取出list里面的值转为map
-				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objCode"));
-				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objCount"));
-				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("dateStr"));
-				System.out.println("liMap.get(\"objCode\") = " + objectMap.get("objName"));
+				//取出list里面的值转为map
+				Map<String, Object> objectMap = (Map<String, Object>) object;
+				//将所有的违禁包裹编码存起来
+				mapCode.put(objectMap.get("objCode").toString(),objectMap.get("objCode").toString());
 			}
+			//遍历违禁编码map数据
+			List<Map<String,Object>> list = new ArrayList<>();
+			for (String value:mapCode.values()) {
+				Integer count = 0;
+				HashMap<String, Object> map = new HashMap<>();
+				for (Object object : objectList) {
+					Map<String, Object> objectMap = (Map<String, Object>) object;//取出list里面的值转为map
+					//将所有的违禁包裹编码存起来
+					if (value.equals(objectMap.get("objCode").toString())){
+						count+=Integer.parseInt(objectMap.get("objCount").toString());
+						map.put("objName",objectMap.get("objName").toString());
+						map.put("objCount",objectMap.get("objCount").toString());
+					}
+				}
+				list.add(map);
+			}
+			return list;
 		}
-
 		return null;
 	}
 
@@ -158,8 +174,8 @@
 		//2.2查询本月的数据
 		if (conditionVo.getStatus() == 2) {
 			//3.获取本月开始时间和结束时间
-			startDate = DateUtils.getWeekStart();
-			endDate = DateUtils.getWeekEnd();
+			startDate = DateUtils.getMonthStart();
+			endDate = DateUtils.getMonthEnd();
 		}
 		map.put("startDate", startDate);
 		map.put("endDate", endDate);

--
Gitblit v1.9.3