From 7e6b4d0547e1b46df3cb3f0385e5d50ce3ca8a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 17 Mar 2021 15:48:42 +0800
Subject: [PATCH] 1.警情保留数据
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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 daa59ca..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
@@ -171,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.获取本月开始时间和结束时间
@@ -216,4 +222,36 @@
//返回数据
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