Gaokun Wang 3 ماه پیش
والد
کامیت
8cd2c393b9

+ 2 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/domain/WarningResult.java

@@ -27,10 +27,10 @@ private static final long serialVersionUID = 1L;
     private Long id;
 
     /** 架次号 */
-    private Long sortieNo;
+    private String sortieNo;
 
     /** 机号 */
-    private Long aircraftId;
+    private String aircraftId;
 
     /** 警告代码 */
     private String code;

+ 4 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/WarningResultBo.java

@@ -1,6 +1,7 @@
 package org.eco.als.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.WarningResult;
@@ -12,6 +13,7 @@ import org.eco.common.orm.core.domain.BaseEntity;
  * @author wgk
  * @date 2025-02-27
  */
+@Builder
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WarningResult.class, reverseConvertGenerate = false)
@@ -24,12 +26,12 @@ public class WarningResultBo extends BaseEntity {
     /**
      * 架次号
      */
-    private Long sortieNo;
+    private String sortieNo;
 
     /**
      * 机号
      */
-    private Long aircraftId;
+    private String aircraftId;
 
     /**
      * 警告代码

+ 2 - 2
als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/WarningResultVo.java

@@ -35,11 +35,11 @@ private static final long serialVersionUID = 1L;
 
     /** 架次号 */
     @ExcelProperty(value = "架次号")
-    private Long sortieNo;
+    private String sortieNo;
 
     /** 机号 */
     @ExcelProperty(value = "机号")
-    private Long aircraftId;
+    private String aircraftId;
 
     /** 警告代码 */
     @ExcelProperty(value = "警告代码")

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

@@ -72,6 +72,8 @@ public class AlgorithmService implements IAlgorithmService {
     private IFormulaService formulaService;
     @Resource
     private IDataImportService dataImportService;
+    @Resource
+    private IWarningResultService warningResultService;
 
     @Value("${kgqa.ask-url}")
     private String askUrl;
@@ -172,6 +174,13 @@ public class AlgorithmService implements IAlgorithmService {
             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())
+              .name(el.getName()).build();
+            warningResultService.insert(warningResultBo);
         });
         DataImportVo dataImportVo = dataImportService.selectById(algorithmBo.getDataId());
         DataImport dataImport = new DataImport();

+ 2 - 0
als-start/src/main/resources/db/dm/V1_0_0_12__als-20250304-dml.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "lqbz"."als_warning_result_t" MODIFY "sortie_no" VARCHAR2(255) NULL;
+ALTER TABLE "lqbz"."als_warning_result_t" MODIFY "aircraft_id" VARCHAR2(255) NULL;