Gaokun Wang 5 сар өмнө
parent
commit
eaa46ab958

+ 7 - 4
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java

@@ -155,10 +155,13 @@ public class AlgorithmService implements IAlgorithmService {
         List<WarningVo> warningList = warningService.selectList(warningBo);
         warningList.forEach(el -> {
             JudgeFaultLogicVo logicVo = judgeFaultLogicService.selectByHmc(el.getCode());
-            ExpressBo expressBo = new ExpressBo();
-            expressBo.setExpression(logicVo.getRemarks());
-            expressBo.setOssId(algorithmBo.getOssId());
-            int result = formulaService.evaluateExpression(expressBo);
+            int result = 3;
+            if (ObjectUtil.isNotNull(logicVo)) {
+                ExpressBo expressBo = new ExpressBo();
+                expressBo.setExpression(logicVo.getRemarks());
+                expressBo.setOssId(algorithmBo.getOssId());
+                result = formulaService.evaluateExpression(expressBo);
+            }
             FalseAlarmResultBo falseAlarmResultBo = FalseAlarmResultBo.builder().code(el.getCode()).name(el.getName()).aircraftId(el.getAircraftId()).sortieNo(el.getSortieNo()).status(String.valueOf(result))
                 .build();
             falseAlarmResultService.insert(falseAlarmResultBo);