航空器警情航班号及飞机型号字段处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -267,13 +267,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				for (AlertFormValue alertFormValue : list) {
 					if("flightNumber".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode()  , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}
 					if("aircraftModel".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode() , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java

@@ -126,10 +126,10 @@ public class RuleAlertCalledService {
 				}
 				//航空器救援
 				if (alertFormValue.getFieldCode().equals("flightNumber")) {
-					alertCalledRo.setFlightNumber(alertFormValue.getFieldValueCode());
+					alertCalledRo.setFlightNumber(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("aircraftModel")) {
-					alertCalledRo.setAircraftModel(alertFormValue.getFieldValueCode());
+					alertCalledRo.setAircraftModel(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("landingTime")) {
 					alertCalledRo.setLandingTime(alertFormValue.getFieldValue());
@@ -160,7 +160,7 @@ public class RuleAlertCalledService {
 
 				//漏油现场安全保障
 				if (alertFormValue.getFieldCode().equals("flightNumber")) {
-					alertCalledRo.setFlightNumberLy(alertFormValue.getFieldValue());
+					alertCalledRo.setFlightNumberLy(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("seat")) {
 					alertCalledRo.setSeat(alertFormValue.getFieldValue());