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

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -965,6 +966,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizPvWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
+            riskBizInfoVo.setWarningTime(DateUtil.now());
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
             RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
             dynamicDetailsVo.setTabName("预警详情");
@@ -1000,6 +1002,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizFanWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizFanWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
+            riskBizInfoVo.setWarningTime(DateUtil.now());
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
             RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
             dynamicDetailsVo.setTabName("预警详情");

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -254,6 +254,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             likeMap.put("systemType", systemType);
         }
         List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
+        List<String> powerOther = Arrays.asList("月发电量", "年发电量", "总发电量");
+        if (!stationBasic.getStationType().equals("FDZ")) {
+            result.forEach(esEquipments -> {
+                if (esEquipments.getEquipmentIndexName().equals("日发电量")) {
+                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
+                }
+                if (powerOther.contains(esEquipments.getEquipmentIndexName())) {
+                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActorCurrentData));
+                }
+            });
+        }
         result.stream().forEach(e -> {
             e.setValue(String.format(CommonConstans.Twodecimalplaces, e.getValueF()));
         });
@@ -271,17 +282,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());
-        List<String> powerOther = Arrays.asList("月发电量", "年发电量", "总发电量");
-        if (!stationBasic.getStationType().equals("FDZ")) {
-            collect.forEach(esEquipments -> {
-                if (esEquipments.getEquipmentIndexName().equals("日发电量")) {
-                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActor * CommonConstans.pvGenPoweActorDay));
-                }
-                if (powerOther.contains(esEquipments.getEquipmentIndexName())) {
-                    esEquipments.setValue(String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(esEquipments.getValue()) * CommonConstans.pvGenPoweActorCurrentData));
-                }
-            });
-        }
+
         page.setTotal(result.size());
         page.setRecords(collect);
         return page;