From 840ad80618dc7e9871f3e0f5a63c2a7a05341725 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 06 五月 2025 13:53:26 +0800
Subject: [PATCH] endTime startTime 判断空串
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index ae19b06..0932aee 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -393,16 +393,16 @@
Date endTime = null;
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
- if (params.containsKey("endTime")) {
- endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- }else {
+ if (!params.containsKey("endTime") || StringUtils.isBlank(params.get("endTime").toString())) {
endTime = calendar.getTime();
- }
- if (params.containsKey("startTime")) {
- startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}else {
+ endTime = DateUtils.parse(params.get("endTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ }
+ if (!params.containsKey("startTime") || StringUtils.isBlank(params.get("startTime").toString())) {
calendar.add(Calendar.DAY_OF_YEAR, -1);
startTime = calendar.getTime();
+ }else {
+ startTime = DateUtils.parse(params.get("startTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
}
switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
--
Gitblit v1.9.3