From 2ed9526f60e64aeaca0a861aa4bf24717554bad1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Mar 2021 22:10:15 +0800
Subject: [PATCH] 违禁包裹分类统计接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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..14bd180 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
@@ -1,18 +1,13 @@
package org.springblade.jfpt.parcel.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.utils.JacksonUtils;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.util.DateUtils;
import org.springblade.jfpt.parcel.util.HttpClientUtils;
-import org.springblade.jfpt.parcel.util.JacksonUtil;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import springfox.documentation.spring.web.json.Json;
-
import java.util.*;
/**
@@ -35,8 +30,8 @@
/**
- * 获取查询条件
- * @param conditionVo 查询条件对象
+ * 获取违禁包裹统计数据，远程调用接口
+ * @param conditionVo 查询条件对象 status 状态码 0：本天 1：本周 2：本月
* @return
*/
@Override
@@ -45,16 +40,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("name",objectMap.get("objName").toString());
+ map.put("value",objectMap.get("objCount").toString());
+ }
+ }
+ list.add(map);
+ }
+ return list;
}
-
return null;
}
@@ -158,8 +169,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