From 55ea1c5472dc0b86a445f9bb914b750dfb47e5f0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 16 Mar 2021 22:17:51 +0800
Subject: [PATCH] 用户会员数量统计接口，一键报警（主动报警），违禁品，红码，体温异常统计接口ok,违禁品分类尚需完善
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 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 52e92e2..d6bf3f5 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,7 +35,7 @@
/**
* 获取违禁包裹统计数据，远程调用接口
- * @param conditionVo 查询条件对象 status 状态码 0：本天 1：本周 2：本月
+ * @param conditionVo 查询条件对象 status 状态码 0：本天 1：近7天 2：本月 3：本周
* @return
*/
@Override
@@ -44,6 +44,7 @@
if (null!=conditionVo.getStatus()) {
//获取数据
List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
+ System.out.println("objectList = " + objectList);
Map<String,String> mapCode = new HashMap<>();
//遍历集合，存储所有的违禁包裹编码
for (Object object : objectList) {
@@ -63,7 +64,7 @@
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());
+ map.put("value",count);
}
}
list.add(map);
@@ -170,6 +171,12 @@
startDate = DateUtils.getPastDate(6,now());
endDate = DateUtils.getToday();
}
+ //2.4查询本周的数据
+ if (conditionVo.getStatus() == 3) {
+ //3.获取过去6天及当天开始时间和结束时间
+ startDate = DateUtils.getWeekStart();
+ endDate = DateUtils.getWeekEnd();
+ }
//2.2查询本月的数据
if (conditionVo.getStatus() == 2) {
//3.获取本月开始时间和结束时间
@@ -199,20 +206,52 @@
//获取包裹数据
List<Object> parcelData = getParcelData(conditionVo, PARCEL_URL, PARCEL_KEY, PARCEL_SECRET);
//查询当天的包裹总数
- Integer checkCount = null;
Integer dangerCount = null;
+ Integer contrabandCount = null;
if (status == 0) {
for (Object object : parcelData) {
//取出list里面的值转为map
Map<String, Object> objectMap = (Map<String, Object>) object;
- checkCount = Integer.parseInt(objectMap.get("checkCount").toString()); //安检包裹数量
dangerCount = Integer.parseInt(objectMap.get("dangerCount").toString()); //违禁包裹数量
+ contrabandCount = Integer.parseInt(objectMap.get("contrabandCount").toString()); //违禁物品数量
}
}
//封装数据
- list.add(checkCount);
list.add(dangerCount);
+ list.add(contrabandCount);
//返回数据
return list;
}
+
+ /**
+ * 查询7天内违禁品每天的数量(需筛选危险品)
+ * @return
+ */
+ @Override
+ public Map<String, Object> selectParcelData() {
+ ConditionVo conditionVo = new ConditionVo();
+ conditionVo.setStatus(1);//近7天status 为 1
+ //获取数据
+ List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
+ //遍历违禁编码map数据
+ HashMap<String, Object> map = new HashMap<>();
+ List<String> times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ List<Integer> list = new ArrayList<>();
+ for (String time:times) {
+ Integer count = 0;
+ //遍历集合数据获取每一天的count
+ for (Object object : objectList) {
+ Map<String, Object> objectMap = (Map<String, Object>) object;//取出list里面的值转为map
+ //对比时间和objCode,危险品，刀具，枪支等
+ if (time.equals(objectMap.get("dateStr").toString()) ){
+ if (objectMap.get("objCode").toString().equals("gan")) {
+ count += Integer.parseInt(objectMap.get("objCount").toString());
+ }
+ }
+ }
+ list.add(count);
+ }
+ map.put("parcelData",list);
+ return map;
+ }
}
--
Gitblit v1.9.3