From 4fd5c674b59960c859bc2af1a0edf7f560dfe22b Mon Sep 17 00:00:00 2001 From: 25604 Date: Thu, 26 Feb 2026 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=9C=BA=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E6=95=B0=E6=8D=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/ChillersParamsController.java | 11 ++++++----- .../impl/CoolingSystemMonitorServiceImpl.java | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/mh-admin/src/main/java/com/mh/web/controller/device/ChillersParamsController.java b/mh-admin/src/main/java/com/mh/web/controller/device/ChillersParamsController.java index b4f0a95..98f7699 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/device/ChillersParamsController.java +++ b/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: diff --git a/mh-system/src/main/java/com/mh/system/service/device/impl/CoolingSystemMonitorServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/device/impl/CoolingSystemMonitorServiceImpl.java index 9cf94a5..d9b993c 100644 --- a/mh-system/src/main/java/com/mh/system/service/device/impl/CoolingSystemMonitorServiceImpl.java +++ b/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 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();