From 132ce8cd39779ccf0d0c3f791ff47901a9a51180 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 11:46:25 +0800
Subject: [PATCH] 预警数量统计接口修改，解决违禁品未能显示全数据问题，主动报警500错误问题
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 14 ++++++++++----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 8852614..7770ffa 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -393,7 +393,7 @@
//获取类型集合数据
String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
types = Arrays.asList(type);
- if (null!=conditionVo){
+ if (null!=conditionVo.getStartTime()){
//获取时间集合数据
times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime());
//1.统计时间段内一键求助警情数量数据 4-7 修改展示紧急求助
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 d44455b..42f44f7 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
@@ -210,9 +210,7 @@
if (null!=conditionVo.getStartTime() && conditionVo.getStartTime()!=""
&& null != conditionVo.getEndTime() && conditionVo.getEndTime()!=""){
startDate = conditionVo.getStartTime().substring(0,10);
- System.out.println("startDate = " + startDate);
endDate = conditionVo.getEndTime().substring(0,10);
- System.out.println("endDate = " + endDate);
}
map.put("startDate", startDate);
map.put("endDate", endDate);
@@ -276,14 +274,22 @@
* @return
*/
public List<Integer> getKindServenDataList(ConditionVo conditionVo){
- if (null==conditionVo){
+ if (null==conditionVo.getStartTime()){
conditionVo.setStatus(1);//近7天status 为 1
}
//获取数据
List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
+ List<String> times = new ArrayList<>();
if (null!=objectList) {
//遍历违禁编码map数据
- List<String> times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ //获取时间
+ if (null!=conditionVo.getStatus()) {
+ times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ }
+ if (null!=conditionVo.getStartTime()){
+ times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(),conditionVo.getEndTime());
+ }
+
List<Integer> list = new ArrayList<>();
for (String time : times) {
Integer count = 0;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java
index 1f80eaa..c664eae 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java
@@ -136,6 +136,10 @@
public static List<String> getTimeOverOneDate(String startDate, String endDate) {
List<String> times = new ArrayList<>();
try {
+ if (startDate.length()<11){
+ startDate = startDate+" 00:00:00";
+ endDate = endDate+" 23:59:59";
+ }
Date startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startDate);
Date endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endDate);
int gap = (int) ((endTime.getTime() - startTime.getTime()) / (24*60*60*1000));
--
Gitblit v1.9.3