From c66b84bc6c3a97e1c81e317e220c34047b9f9273 Mon Sep 17 00:00:00 2001
From: WeiRan <2392355487@qq.com>
Date: Wed, 25 Sep 2024 15:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=A8=A1=E5=9D=97=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FaultRuleServiceImpl.java    | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java
index 3a4cc8f..4ab924c 100644
--- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java
+++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java
@@ -33,7 +33,6 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
     @Override
     public List<Vehicle> checkfault(CarFaultRule carFaultRule) {
         List<Vehicle> vehicles = new ArrayList<>();
-
         //根据车辆VIN判断它属于什么类型的车辆
         CarInformation carInformation = faultRuleMapper.selectTypeByVIN(carFaultRule.getVin());
         Integer carInformationType = carInformation.getCarInformationType();
@@ -54,26 +53,38 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
                         if (faultCondition.getMessageTypeCode().equals(declaredField.getName())){
                             String faultconditionIdentification = faultCondition.getFaultconditionIdentification();
                             BigDecimal faultconditionParameter = faultCondition.getFaultconditionParameter();
-                            //判断条件选择
+                            // 尝试将值转换为BigDecimal
+                            BigDecimal bigDecimalValue = null;
+                            if (value instanceof Number) {
+                                Number numberValue = (Number) value;
+                                if (numberValue instanceof Long || numberValue instanceof Integer) {
+                                    bigDecimalValue = BigDecimal.valueOf(numberValue.longValue());
+                                } else if (numberValue instanceof Double || numberValue instanceof Float) {
+                                    // 注意：Double转BigDecimal可能会引入精度问题，因为Double本身可能不精确
+                                    // 如果需要精确控制，可以考虑从源头使用BigDecimal
+                                    bigDecimalValue = BigDecimal.valueOf(numberValue.doubleValue());
+                                }
+                            }
+                                //判断条件选择
                             if (faultconditionIdentification.equals(">") || faultconditionIdentification.equals("&gt;") ){
-                                if (BigDecimal.valueOf((Long) value).compareTo(faultconditionParameter)>0){
-                                   vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField+"超出规定范围"));
+                                if (bigDecimalValue.compareTo(faultconditionParameter)>0){
+                                   vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField.getName()+"超出规定范围"));
                                 }
                             }else if(faultconditionIdentification.equals("<") || faultconditionIdentification.equals("&lt;")){
-                                if (BigDecimal.valueOf((Long) value).compareTo(faultconditionParameter)<0){
-                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField+"过低"));
+                                if (bigDecimalValue.compareTo(faultconditionParameter)<0){
+                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField.getName()+"过低"));
                                 }
                             }else if(faultconditionIdentification.equals(">=") || faultconditionIdentification.equals("&gt;=")){
-                                if (BigDecimal.valueOf((Long) value).compareTo(faultconditionParameter)>0){
-                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField+"超出规定范围")) ;
+                                if (bigDecimalValue.compareTo(faultconditionParameter)>=0){
+                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField.getName()+"超出规定范围")) ;
                                 }
                             }else if(faultconditionIdentification.equals("<=") || faultconditionIdentification.equals("&lt;=")){
-                                if (BigDecimal.valueOf((Long) value).compareTo(faultconditionParameter)<0){
-                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField+"过低"));
+                                if (bigDecimalValue.compareTo(faultconditionParameter)<=0){
+                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField.getName()+"过低"));
                                 }
                             }else {
-                                if (BigDecimal.valueOf((Long) value).compareTo(faultconditionParameter)==0){
-                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField+"已达到故障点"));
+                                if (bigDecimalValue.compareTo(faultconditionParameter)==0){
+                                    vehicles.add(new Vehicle(carFaultRule.getVin(),declaredField.getName()+"已达到故障点"));
                                 }
                             }
                         }
@@ -85,6 +96,6 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
             }
 
         }
-        return null;
+        return vehicles;
     }
 }