From bc0fdd1f0c20ca4737e8f073050f37b27a658694 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 16:31:12 +0800
Subject: [PATCH] 管路&气柜产能负载优化,实现动态row聚合统计

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
index dfb3c28..ed19b40 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
@@ -1,5 +1,6 @@
 package com.aps.core.service.impl;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Stream;
@@ -8,7 +9,6 @@
 import com.aps.common.core.utils.uuid.IdUtils;
 import com.aps.core.domain.ApsResourceGroupTemp;
 import com.aps.core.mapper.ApsResourceGroupTempMapper;
-import com.aps.core.param.ApsResourceGroupParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.aps.core.mapper.ApsResourceGroupMapper;
@@ -49,7 +49,7 @@
      * @return 璧勬簮缁�
      */
     @Override
-    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroupParam apsResourceGroup)
+    public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroup apsResourceGroup)
     {
         return apsResourceGroupMapper.selectApsResourceGroupList(apsResourceGroup);
     }
@@ -116,7 +116,9 @@
             tempList.forEach(temp->{
                 temp.setId(IdUtils.simpleUUID());
                 //璁$畻閫昏緫锛氱悊璁轰骇鑳�=璁惧鏁伴噺x姣忔棩鐞嗚鏃堕棿x鎴闇�姹傛棩鍓╀綑澶╂暟
-                temp.setTheoryCapacity(temp.getDevicesQuantity()*temp.getTheoryHours()*temp.getRestDays());
+                BigDecimal devicesQuantity = new BigDecimal(temp.getDevicesQuantity());
+                BigDecimal restDays = new BigDecimal(temp.getRestDays());
+                temp.setTheoryCapacity(devicesQuantity.multiply(temp.getTheoryHours()).multiply(restDays));
                 temp.setBatchNumber(batchNum);
                 temp.setCreateTime(DateUtils.getNowDate());
                 apsResourceGroupTempMapper.insertApsResourceGroupTemp(temp);

--
Gitblit v1.9.3