From 81d863041143bce34c8fafc0215a11e571833b6d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 05 一月 2026 18:07:31 +0800
Subject: [PATCH] 规则调整
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index 7b71935..4ae23bf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
@@ -111,9 +111,24 @@
VideoPoint videoPoint = videoPointService.getByCode(videoAlarmReport.getPlatResourceId());
if (videoPoint != null) {
- // 鏃堕棿瓒呰繃17鐐规垨鑰�12-14鐐逛笉澶勭悊锛屾浠朵负涓嶅鐞�
- if (videoAlarmReport.getAlarmTime().getHour() >= 17 ||
- (videoAlarmReport.getAlarmTime().getHour() < 14 && videoAlarmReport.getAlarmTime().getHour() >= 12)) {
+//鎴戞潵鍒嗘瀽涓�涓嬭繖涓潯浠跺垽鏂�傛牴鎹敞閲�"鍛ㄤ竴鑷冲懆浜斾笂鍗�8锛�30-12锛�00 涓嬪崍2锛�00-17锛�00锛屽鐞嗘浠讹紝鍏朵粬鏃堕棿涓嶅鐞�"锛岄渶瑕佷慨鏀瑰垽鏂潯浠舵潵姝ｇ‘璇嗗埆闈炲伐浣滄椂闂淬��
+//
+//褰撳墠浠ｇ爜鍙垽鏂簡灏忔椂锛屼絾闇�瑕侊細
+//1. 鍒ゆ柇鏄惁涓哄懆涓�鑷冲懆浜�
+//2. 鍒ゆ柇鏄惁鍦ㄥ伐浣滄椂闂存鍐咃紙涓婂崍8:30-12:00锛屼笅鍗�14:00-17:00锛�
+
+ // 鍛ㄤ竴鑷冲懆浜斾笂鍗�8锛�30-12锛�00 涓嬪崍2锛�00-17锛�00锛屽鐞嗘浠讹紝鍏朵粬鏃堕棿涓嶅鐞�
+ LocalDateTime alarmTime = videoAlarmReport.getAlarmTime();
+ int hour = alarmTime.getHour();
+ int minute = alarmTime.getMinute();
+ int dayOfWeek = alarmTime.getDayOfWeek().getValue(); // 1=鍛ㄤ竴, 7=鍛ㄦ棩
+
+ boolean isWeekday = dayOfWeek >= 1 && dayOfWeek <= 5;
+ boolean isMorningShift = hour == 8 && minute >= 30 || hour > 8 && hour < 12;
+ boolean isAfternoonShift = hour >= 14 && hour < 17;
+
+ // 濡傛灉涓嶆槸宸ヤ綔鏃ユ垨涓嶅湪宸ヤ綔鏃堕棿娈靛唴锛屽垯涓嶅鐞�
+ if (!isWeekday || !(isMorningShift || isAfternoonShift)) {
baseCase.setState(4);
}
--
Gitblit v1.8.0