Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 1ad9712c authored by maoying's avatar maoying
Browse files
Options

merge dev

parents f56dffa2 9ccbc8ee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ 1ad9712c
...@@ -22,6 +22,7 @@ import java.util.stream.Collectors; ...@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -1072,7 +1073,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -1072,7 +1073,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
continue; continue;
} }
EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("CODE")); 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"))) { if (!ObjectUtils.isEmpty(map.get("level"))) {
double area = 0; double area = 0;
if (!ObjectUtils.isEmpty(map.get("area"))) { if (!ObjectUtils.isEmpty(map.get("area"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment