From 3c81c99e7aab63c6b1afe39839ef778d594af4a8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 21 一月 2025 15:21:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/task/FlowableTask.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java
index 190a405..2e247ae 100644
--- a/business/src/main/java/com/ycl/task/FlowableTask.java
+++ b/business/src/main/java/com/ycl/task/FlowableTask.java
@@ -82,7 +82,11 @@
String[] yellowTimeArr = yellowTimeStr.split("-");
// 瑙ｆ瀽澶╂暟鍜屽皬鏃舵暟
int days = Integer.parseInt(yellowTimeArr[0]);
- int hours = Integer.parseInt(yellowTimeArr[1]);
+ int hours = 0;
+ // 鍏煎涔嬪墠閰嶇疆鐨勬暣鏁板ぉ
+ if (yellowTimeArr.length > 1) {
+ hours = Integer.parseInt(yellowTimeArr[1]);
+ }
yellowTime = (days * 24L + hours) * 3600L;
}
String redTimeStr = processCoding.getRedTime();
@@ -90,15 +94,18 @@
String[] redTimeArr = redTimeStr.split("-");
// 瑙ｆ瀽澶╂暟鍜屽皬鏃舵暟
int days = Integer.parseInt(redTimeArr[0]);
- int hours = Integer.parseInt(redTimeArr[1]);
+ int hours = 0;
+ if (redTimeArr.length > 1) {
+ hours = Integer.parseInt(redTimeArr[1]);
+ }
redTime = (days * 24L + hours) * 3600L;
}
if (startTime == null) continue;
long durationDay = (now.getTime() - startTime.getTime()) / 1000;
String status = GREEN; // 榛樿鐘舵�佷负缁胯壊
- if (redTime != null && durationDay >= redTime) {
+ if (redTime != null && redTime !=0 && durationDay >= redTime) {
status = RED; // 濡傛灉瓒呰繃绾㈣壊鏃堕棿闃堝�硷紝鍒欑姸鎬佷负绾㈣壊
- } else if (yellowTime != null && durationDay >= yellowTime) {
+ } else if (yellowTime != null && yellowTime !=0 && durationDay >= yellowTime) {
status = YELLOW; // 鍚﹀垯锛屽鏋滆秴杩囬粍鑹叉椂闂撮槇鍊硷紝鍒欑姸鎬佷负榛勮壊
}
List<String> processInsIds = map.get(status);
--
Gitblit v1.8.0