From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
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