火灾等级处理

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/FireStatisticsPO.java

@@ -52,4 +52,9 @@ public class FireStatisticsPO {
      */
     private String fireCause;
 
+    /**
+     * 火灾登记
+     */
+    private String fireLevel;
+
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireStatisticsServiceImpl.java

@@ -129,16 +129,16 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         return fireStatisticsMapper.getAddress().stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
     }
 
-    public FireStatisticsPO enhanceFireStatisticsPo(Map<String,String> map){
-        FireStatisticsPO fireStatisticsPo = new FireStatisticsPO();
-        fireStatisticsPo.setId(Optional.ofNullable(map.get("火灾序号")).orElse(""));
-        fireStatisticsPo.setAddress(Optional.ofNullable(map.get("起火地点")).orElse(""));
-        fireStatisticsPo.setBurnedArea(Optional.ofNullable(map.get("过火面积")).orElse(""));
-        fireStatisticsPo.setPropertyLoss(Optional.ofNullable(map.get("直接财产损失")).orElse(""));
-        fireStatisticsPo.setDeathToll(Optional.ofNullable(map.get("死亡人数")).orElse(""));
-        fireStatisticsPo.setNonFatal(Optional.ofNullable(map.get("受灾人数")).orElse(""));
-        fireStatisticsPo.setDisasterHome(Optional.ofNullable(map.get("受灾户数")).orElse(""));
-        fireStatisticsPo.setFireCause(Optional.ofNullable(map.get("火灾原因分类（一级）")).orElse(""));
+    public FireStatisticsPO enhanceFireStatisticsPo(Map<String,String> map){FireStatisticsPO fireStatisticsPo = new FireStatisticsPO();
+        fireStatisticsPo.setId(Optional.ofNullable(map.get("火灾序号")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setAddress(Optional.ofNullable(map.get("起火地点")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setBurnedArea(Optional.ofNullable(map.get("过火面积")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setPropertyLoss(Optional.ofNullable(map.get("直接财产损失")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setDeathToll(Optional.ofNullable(map.get("死亡人数")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setNonFatal(Optional.ofNullable(map.get("受灾人数")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setDisasterHome(Optional.ofNullable(map.get("受灾户数")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setFireCause(Optional.ofNullable(map.get("火灾原因分类（一级）")).filter(s -> !"null".equals(s)).orElse(""));
+        fireStatisticsPo.setFireLevel(Optional.ofNullable(map.get("火灾等级")).filter(s -> !"null".equals(s)).orElse(""));
         return fireStatisticsPo;
     }
 }