修改警情接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -29,4 +29,6 @@ public interface IotFeignClient {
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> findImgByFileCategory();
     
+    @RequestMapping(value = "/v1/iot/DynamicFlightInfo/detail/{dynamicFlightId}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable String dynamicFlightId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -194,6 +194,7 @@ public class AircraftController extends BaseController {
     		Map<String, Object> map= dataModel.getResult();
     		if(map!=null) {
     			  map1.put("aircraftModel", map.get("aircraftType"));
+    			  map1.put("dynamicFlightId", map.get("dynamicFlightId"));
     	          map1.put("landingTime", map.get("sta"));
 //    	          map1.put("fuelQuantity", map.get(""));
     	          map1.put("passengerCapacity", map.get("psgNumTotal"));  
@@ -227,7 +228,7 @@ public class AircraftController extends BaseController {
             }
         }
         Map<String, Object> map=new HashedMap();
-        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.getDynamicFlightInfo(num);
+        ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.findImgByDynamicFlightId(num);
         if(dataModel!=null) {
            map= dataModel.getResult();
         }

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

@@ -376,7 +376,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
         listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
         list.stream().forEach(AlertFormValue -> {
-            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
+        	String valueCode = AlertFormValue.getFieldValueCode();
+        	if(null == valueCode) {
+        		valueCode = AlertFormValue.getFieldValue();
+        	}
+            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(),valueCode));
         });
         map.put("data", listdate);
         return map;