From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/DateUtils.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
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