Pārlūkot izejas kodu

闵行火灾气泡图优化

yq 3 gadi atpakaļ
vecāks
revīzija
ed7867c782

+ 0 - 2
mhfire-service/src/main/java/com/bizmatics/mhfire/service/api/mhWater/OneCardApi.java

@@ -108,7 +108,6 @@ public class OneCardApi {
      * 调用心跳接口
      */
     public void callInfoApi(Object param){
-        log.info("闵行水系统心跳---开始");
         sendApiBase(String.format("%s%s",path,"/iot/bomb/yt"),param,data -> log.info("获取到的数据"+ data));
     }
 
@@ -117,7 +116,6 @@ public class OneCardApi {
      * 调用告警接口
      */
     public void callAlarmApi(Object param){
-        log.info("闵行水系统告警---开始");
         sendApiBase(String.format("%s%s",path,"/iot/alarm/yt"),param,data -> log.info("获取到的数据"+ data));
     }
 

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

@@ -218,7 +218,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
             fireBubbleVo.setFireCount(fireStatisticsMapper.selectCount(startTime,endTime,null,fireType,unitId,s));
             if (null != maps){
                 fireBubbleVo.setDeathToll(Optional.ofNullable(maps.get("deathPerson")).map(Double::intValue).orElse(0));
-                fireBubbleVo.setFireArea(Arith.div(maps.get("fireArea"),1));
+                fireBubbleVo.setFireArea(Optional.ofNullable(maps.get("fireArea")).filter(d -> 0.00 != d && d != 0).map(d -> Arith.div(d,1)).orElse(0.00));
             }else {
                 fireBubbleVo.setDeathToll(0);
                 fireBubbleVo.setFireArea(0.00);