From b9a0c36b2be2cf1f5a699a86d8e72e20e782a0be Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 21 Jul 2026 14:56:33 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-21=20=E5=BC=82=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScheduleServiceImpl.java         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 59845e2..d315034 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -3654,7 +3654,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                             continue;
                         }
                         fillSplitRuleMatchResult(resultMap, rule, child);
-                        fillSplitRuleMetricData(resultMap, metricContext);
+                        fillSplitRuleMetricData(resultMap, metricContext, child);
                         saveSplitRuleMatchedData(inData, String.valueOf(resultMap.get("action")), child, metricContext);
                         return resultMap;
                     }
@@ -4079,13 +4079,16 @@ public class ScheduleServiceImpl implements ScheduleService {
         resultMap.put("conditionNo", condition.getConditionNo());
         resultMap.put("triggerEvent", triggerEvent);
         resultMap.put("forceType", forceType);
+        resultMap.put("relationField", condition.getRelationField());
+        resultMap.put("compareSymbol", condition.getCompareSymbol());
+        resultMap.put("conditionParam", condition.getConditionParam());
         resultMap.put("warningLevel", condition.getWarningLevel());
         resultMap.put("responsibilityDept", condition.getResponsibilityDept());
 
         if ("异常代码".equals(triggerEvent)) {
             resultMap.put("action", ACTION_OPEN_DEFECT);
             resultMap.put("lockPage", "N");
-            resultMap.put("message", "触发提示规则，本次操作完成后将打开【报告不良】。");
+            resultMap.put("message", "触发【异常代码】提示规则，请确认是否继续执行当前操作。");
             return;
         }
 
@@ -4097,7 +4100,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             } else {
                 resultMap.put("action", ACTION_OPEN_DOWNTIME);
                 resultMap.put("lockPage", "N");
-                resultMap.put("message", "触发提示规则，本次操作完成后将打开【异常停机】。");
+                resultMap.put("message", "触发【异常单】提示规则，请确认是否继续执行当前操作。");
             }
             return;
         }
@@ -4235,13 +4238,17 @@ public class ScheduleServiceImpl implements ScheduleService {
         scheduleTodoMessageMapper.insertTodoMessage(entity);
     }
 
-    private void fillSplitRuleMetricData(Map<String, Object> resultMap, SplitRollMetricContext metricContext) {
+    private void fillSplitRuleMetricData(Map<String, Object> resultMap,
+                                         SplitRollMetricContext metricContext,
+                                         SysSceneExceptionRuleConditionEntity condition) {
         if (metricContext == null) {
             return;
         }
         resultMap.put("matchedRollIndex", metricContext.rollIndex);
         resultMap.put("matchedDefectRate", getMetricValue(metricContext, "不良率"));
         resultMap.put("matchedTotalQty", getMetricValue(metricContext, "总数"));
+        String relationField = condition == null ? null : StringUtils.trimWhitespace(condition.getRelationField());
+        resultMap.put("matchedConditionValue", getMetricValue(metricContext, relationField));
         resultMap.put("lockedTime", DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
     }