merge dev

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -1072,7 +1073,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     continue;
                 }
                 EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("CODE"));
-                map.put("level", String.format("%.2f", Double.valueOf(data.getState())));
+                map.put("level", String.format("%.2f", StringUtils.isNumeric(data.getState())?Double.valueOf(data.getState()):0));
                 if (!ObjectUtils.isEmpty(map.get("level"))) {
                     double area = 0;
                     if (!ObjectUtils.isEmpty(map.get("area"))) {