1、主机监控、详情页数据优化

mh-admin/src/main/java/com/mh/web/controller/device/ChillersParamsController.java

@@ -18,6 +18,7 @@ import com.mh.system.service.device.ICommunicationParamsService;
 import com.mh.system.service.energy.IEnergyService;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,27 +72,27 @@ public class ChillersParamsController extends BaseController {
                     switch (vo.getParamType()) {
                         case "1":   // 运行状态
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "运行" : "停止");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "运行" : "停止");
                             }
                             break;
                         case "2":   // 启停
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "启动" : "停止");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "启动" : "停止");
                             }
                             break;
                         case "5":   // 故障
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "故障" : "正常");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "故障" : "正常");
                             }
                             break;
                         case "6":   // 手自动切换
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "手动" : "自动");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "手动" : "自动");
                             }
                             break;
                         case "22":   // 本地远程切换
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "远程" : "本地");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "远程" : "本地");
                             }
                             break;
                         default:

mh-system/src/main/java/com/mh/system/service/device/impl/CoolingSystemMonitorServiceImpl.java

@@ -1,6 +1,7 @@
 package com.mh.system.service.device.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mh.common.core.domain.dto.ProProfileDTO;
 import com.mh.common.core.domain.dto.SysPerformanceDTO;
 import com.mh.common.core.domain.entity.CollectionParamsManage;
 import com.mh.common.core.domain.entity.SysParams;
@@ -13,6 +14,8 @@ import com.mh.system.mapper.WeatherDataMapper;
 import com.mh.system.mapper.device.CollectionParamsManageMapper;
 import com.mh.system.service.device.ICollectionParamsManageService;
 import com.mh.system.service.device.ICoolingSystemMonitorService;
+import com.mh.system.service.overview.IProOverviewService;
+import com.mh.system.service.overview.impl.ProOverviewServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -37,10 +40,13 @@ public class CoolingSystemMonitorServiceImpl implements ICoolingSystemMonitorSer
 
     private final CollectionParamsManageMapper collectionParamsManageMapper;
 
-    public CoolingSystemMonitorServiceImpl(SysParamsMapper sysParamsMapper, WeatherDataMapper weatherDataMapper, CollectionParamsManageMapper collectionParamsManageMapper) {
+    private final IProOverviewService overviewService;
+
+    public CoolingSystemMonitorServiceImpl(SysParamsMapper sysParamsMapper, WeatherDataMapper weatherDataMapper, CollectionParamsManageMapper collectionParamsManageMapper, IProOverviewService overviewService) {
         this.sysParamsMapper = sysParamsMapper;
         this.weatherDataMapper = weatherDataMapper;
         this.collectionParamsManageMapper = collectionParamsManageMapper;
+        this.overviewService = overviewService;
     }
 
     @Override
@@ -226,6 +232,15 @@ public class CoolingSystemMonitorServiceImpl implements ICoolingSystemMonitorSer
                     }
                 }
             }
+            List<ProProfileDTO> proProfile = overviewService.getProProfile();
+            if (null != proProfile && !proProfile.isEmpty()) {
+                // 今年累计冷量
+                BigDecimal yearCold = proProfile.getFirst().getYearCold();
+                sysPerformanceDTO.setYearCold(yearCold);
+                // 今年累计电量
+                BigDecimal yearEle = proProfile.getFirst().getYearEle();
+                sysPerformanceDTO.setYearPower(yearEle);
+            }
             // 开始计算瞬时EER和累计EER
             BigDecimal yearPower = sysPerformanceDTO.getYearPower();
             BigDecimal yearCold = sysPerformanceDTO.getYearCold();