Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -18,7 +18,7 @@
         </if>
     </select>
 
-
+    <!-- //判断是否航空器救援 如果为航空器救援则保存冗余字段 response_level_code bug2542 bykongfm  -->
     <select id="alertCalledListByAlertStatus" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto">
         SELECT
         a.sequence_nbr sequenceNbr,
@@ -34,9 +34,9 @@
         a.coordinate_x longitude,
         a.coordinate_y latitude,
         CASE a.response_level_code
-        WHEN '243' THEN '一级'
-        WHEN '244' THEN '二级'
-        WHEN '245' THEN '三级'
+        WHEN '1164' THEN '紧急出动'
+        WHEN '1165' THEN '紧急集结'
+        WHEN '1166' THEN '原地待命'
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
         where a.is_delete=0

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -65,10 +65,15 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     public void saveFirefighters(FirefightersInfoDto firefighters) {
         Firefighters firefighter = firefighters.getFirefighters();
         // 现居住地保存地址信息 户籍所在地信息 BUG3553 bykongfm
-        FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
-        firefighter.setResidence(region.getResult().getRegionName());
-        FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
-        firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+        // BUG2168 居住地户籍所在地为空判断 bykongfm
+        if(firefighter.getResidenceDetails() != null) {
+            FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+            firefighter.setResidence(region.getResult().getRegionName());
+        }
+        if(firefighter.getNativePlace() != null) {
+            FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+            firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+        }
         save(firefighter);
         FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
         firefightersContact.setFirefightersId(firefighter.getSequenceNbr());

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

@@ -168,10 +168,15 @@ public class FirefightersController extends BaseController {
 			@RequestBody FirefightersInfoDto firefighters) {
 		try {
 			Firefighters firefighter = firefighters.getFirefighters();
-			FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
-			firefighter.setResidence(region.getResult().getRegionName());
-			FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
-			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+			// BUG2168 居住地户籍所在地为空判断 bykongfm
+			if(firefighter.getResidenceDetails() != null) {
+				FeignClientResult<RegionModel> region =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getResidenceDetails()));
+				firefighter.setResidence(region.getResult().getRegionName());
+			}
+			if(firefighter.getNativePlace() != null) {
+				FeignClientResult<RegionModel> nativePlace =  Systemctl.regionClient.getRegion(Long.parseLong(firefighter.getNativePlace()));
+				firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
+			}
 			iFirefightersService.updateById(firefighter);
 			ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
 			// 删除缓存

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

@@ -235,6 +235,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
             } else {
                 alertCalled.setType("1");
             }
+            // 动态表单
+            List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
+            //判断是否航空器救援 如果为航空器救援则保存冗余字段 response_level_code bug2542 bykongfm
+            if(AlertStageEnums.HKJY.getCode().equals(alertCalled.getAlertTypeCode())) {
+                alertFormValuelist.stream().forEach(alertFormValue -> {
+                    if(alertFormValue.getFieldCode().equals("responseLevel")){
+                        alertCalled.setResponseLevelCode(alertFormValue.getFieldValueCode());
+                    }
+                });
+            }
 
             // 判断是否归并警情
             if (alertCalled.getFatherAlert() != null) {
@@ -244,8 +254,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
                 alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
                 this.save(alertCalled);
-                // 动态表单
-                List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
+
                 // 填充警情主键
                 alertFormValuelist.stream().forEach(alertFormValue -> {
                     alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
@@ -262,9 +271,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 alertCalled.setAlarmType(AlertStageEnums.JQCB.getValue());
                 alertCalled.setAlarmTypeCode(AlertStageEnums.JQCB.getCode());
                 this.save(alertCalled);
-
-                // 动态表单
-                List<AlertFormValue> alertFormValuelist = alertCalledObjsDto.getAlertFormValue();
                 // 填充警情主键
                 alertFormValuelist.stream().forEach(alertFormValue -> {
                     alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());