|
@@ -165,22 +165,23 @@ public class AlgorithmService implements IAlgorithmService {
|
|
|
warningList.forEach(el -> {
|
|
|
JudgeFaultLogicVo logicVo = judgeFaultLogicService.selectByHmc(el.getCode());
|
|
|
int result = 3;
|
|
|
+ WarningResultBo warningResultBo = WarningResultBo.builder()
|
|
|
+ .sortieNo(algorithmBo.getSortieNo())
|
|
|
+ .code(el.getCode())
|
|
|
+ .hmc(el.getCode()).resultContent(String.valueOf(result))
|
|
|
+ .aircraftId(algorithmBo.getAircraftId())
|
|
|
+ .name(el.getName()).build();
|
|
|
if (ObjectUtil.isNotNull(logicVo)) {
|
|
|
ExpressBo expressBo = new ExpressBo();
|
|
|
expressBo.setExpression(logicVo.getRemarks());
|
|
|
expressBo.setOssId(algorithmBo.getOssId());
|
|
|
result = formulaService.evaluateExpression(expressBo);
|
|
|
+ warningResultBo.setAttribute1(logicVo.getName());
|
|
|
+
|
|
|
}
|
|
|
FalseAlarmResultBo falseAlarmResultBo = FalseAlarmResultBo.builder().falseAlarmId(algorithmBo.getDataId()).code(el.getCode()).name(el.getName()).aircraftId(el.getAircraftId()).sortieNo(el.getSortieNo()).status(String.valueOf(result))
|
|
|
.build();
|
|
|
falseAlarmResultService.insert(falseAlarmResultBo);
|
|
|
- WarningResultBo warningResultBo = WarningResultBo.builder()
|
|
|
- .sortieNo(algorithmBo.getSortieNo())
|
|
|
- .code(el.getCode())
|
|
|
- .hmc(el.getCode()).resultContent(String.valueOf(result))
|
|
|
- .aircraftId(algorithmBo.getAircraftId())
|
|
|
- .attribute1(logicVo.getName())
|
|
|
- .name(el.getName()).build();
|
|
|
warningResultService.insert(warningResultBo);
|
|
|
});
|
|
|
if (CollUtil.isNotEmpty(warningList)) {
|