关闭优化

slibra-common/src/main/java/com/slibra/common/DecimalUtils.java

@@ -24,7 +24,7 @@ public class DecimalUtils {
 
     public static BigDecimal getAbsAndScale(BigDecimal req, int length){
         if(Objects.isNull(req))
-            return null;
+            return BigDecimal.ZERO;
         return req.abs().setScale(length, RoundingMode.DOWN);
     }
 

slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -1655,6 +1655,8 @@ public class AsyncTask {
             if(CollectionUtils.isEmpty(tXinyiWarningRecords)){
                 //新增的断点的数据全部都报警
                 for (TXinyiWarningRecord tXinyiWarningRecord : breakPointList) {
+                    //关闭该指标的其他类型的报警
+                    closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_GYK.getCode());
                     //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                     tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_GYK.getMsg());
                     tXinyiWarningRecord.setSymbol(BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_GYK.getCode());
@@ -1670,6 +1672,8 @@ public class AsyncTask {
                 //插入新的报警
                 if(!CollectionUtils.isEmpty(breakPointListNew)){
                     for (TXinyiWarningRecord tXinyiWarningRecord : breakPointListNew) {
+                        //关闭该指标的其他类型的报警
+                        closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_GYK.getCode());
                         //新插入
                         //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                         tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_GYK.getMsg());
@@ -1775,6 +1779,8 @@ public class AsyncTask {
             if(CollectionUtils.isEmpty(tXinyiWarningNoChangeMoreRecords)){
                 //新增的断点的数据全部都报警
                 for (TXinyiWarningRecord tXinyiWarningRecord : noChangeList) {
+                    //关闭该指标的其他类型的报警
+                    closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_LX_MORE.getCode());
                     //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                     tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_LX_MORE.getMsg());
                     tXinyiWarningRecord.setSymbol(BusinessEnum.WarningSymbolEnum.YBGZ_LX_MORE.getCode());
@@ -1790,6 +1796,8 @@ public class AsyncTask {
                 //插入新的报警
                 if(!CollectionUtils.isEmpty(noChangeListNew)){
                     for (TXinyiWarningRecord tXinyiWarningRecord : noChangeListNew) {
+                        //关闭该指标的其他类型的报警
+                        closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_LX_MORE.getCode());
                         //新插入
                         //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                         tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_LX_MORE.getMsg());
@@ -4263,6 +4271,8 @@ public class AsyncTask {
             if(CollectionUtils.isEmpty(tXinyiWarningRecords)){
                 //新增的断点的数据全部都报警
                 for (TXinyiWarningRecord tXinyiWarningRecord : breakPointList) {
+                    //关闭该指标的其他类型的报警
+                    closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_HYS.getCode());
                     //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                     tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_HYS.getMsg());
                     tXinyiWarningRecord.setSymbol(BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_HYS.getCode());
@@ -4278,6 +4288,8 @@ public class AsyncTask {
                 //插入新的报警
                 if(!CollectionUtils.isEmpty(breakPointListNew)){
                     for (TXinyiWarningRecord tXinyiWarningRecord : breakPointListNew) {
+                        //关闭该指标的其他类型的报警
+                        closeOtherWarningsByCategory(tXinyiWarningRecord.getCategory(), BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_HYS.getCode());
                         //新插入
                         //原来集合里存放的都是单指标异常 下面2个值需要重新赋值
                         tXinyiWarningRecord.setReason(tXinyiWarningRecord.getCategory() + BusinessEnum.WarningSymbolEnum.YBGZ_DD_MORE_HYS.getMsg());