From 002cea95d5f7e04ef6c715c7f1d60b1e69fa848c Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 20 Feb 2025 09:15:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A0=E5=BC=BA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=87=AA=E5=8A=A8=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/comparator/FloatCompare.java | 7 ++++++-
 src/main/java/com/xydl/cac/comparator/IntCompare.java   | 7 ++++++-
 src/main/java/com/xydl/cac/task/RuleCheckTask.java      | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xydl/cac/comparator/FloatCompare.java b/src/main/java/com/xydl/cac/comparator/FloatCompare.java
index ca3cc9f..003c906 100644
--- a/src/main/java/com/xydl/cac/comparator/FloatCompare.java
+++ b/src/main/java/com/xydl/cac/comparator/FloatCompare.java
@@ -14,7 +14,12 @@ public class FloatCompare extends Comparator {
     @Override
     public boolean compare(Object source, String threshold, Date lastDTime) {
         if (source != null) {
-            float s1 = (float) source;
+            float s1;
+            if (source instanceof Number) {
+                s1 = (float) source;
+            } else {
+                s1 = Float.valueOf(source.toString());
+            }
 
             if ("BTW".equalsIgnoreCase(operator)) {
                 String[] strs = threshold.split(",");
diff --git a/src/main/java/com/xydl/cac/comparator/IntCompare.java b/src/main/java/com/xydl/cac/comparator/IntCompare.java
index d3a657c..7023f9f 100644
--- a/src/main/java/com/xydl/cac/comparator/IntCompare.java
+++ b/src/main/java/com/xydl/cac/comparator/IntCompare.java
@@ -11,7 +11,12 @@ public class IntCompare extends Comparator {
     @Override
     public boolean compare(Object source, String threshold, Date lastDTime) {
         if (source != null) {
-            int s1 = (int) source;
+            int s1;
+            if (source instanceof Integer) {
+                s1 = (int) source;
+            } else {
+                s1 = Integer.valueOf(source.toString());
+            }
 
             if ("BTW".equalsIgnoreCase(operator)) {
                 String[] strs = threshold.split(",");
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index 148d448..8b9f151 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -83,7 +83,7 @@ public class RuleCheckTask {
                 }
             }
         } catch (Exception e) {
-            log.error("RuleCheckTask.ruleCheck error.", e);
+            log.error("RuleCheckTask.ruleCheck error. ruleId=" + rule.getId(), e);
         }
     }