From 175c2f6ad2977bf8de44a5c83877634be4087dd9 Mon Sep 17 00:00:00 2001
From: 25604 <ljf25604@163.com>
Date: Fri, 17 Oct 2025 19:27:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E8=83=BD=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=8E=E5=A4=8F=E9=A1=B9=E7=9B=AE=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/EnergyServiceImpl.java   | 15 ++++++++++++++-
 .../user/service/impl/SummaryServiceImpl.java  | 18 +++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java
index 09120ba..fb82d87 100644
--- a/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java
+++ b/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java
@@ -1,12 +1,14 @@
 package com.mh.user.service.impl;
 
 import com.alibaba.druid.util.StringUtils;
+import com.mh.user.constants.Constant;
 import com.mh.user.entity.AreaEntity;
 import com.mh.user.entity.EnergyEntity;
 import com.mh.user.mapper.EnergyMapper;
 import com.mh.user.model.SumModel;
 import com.mh.user.service.AreaService;
 import com.mh.user.service.BuildingService;
+import com.mh.user.service.DealDataService;
 import com.mh.user.service.EnergyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +28,9 @@ public class EnergyServiceImpl implements EnergyService {
     @Autowired
     private AreaService areaService;
 
+    @Autowired
+    private DealDataService dealDataService;
+
     @Override
     public void saveEnergy(EnergyEntity energyEntity,int type) {
 
@@ -73,7 +78,15 @@ public class EnergyServiceImpl implements EnergyService {
                 return list;
             }
             // 根据区域id获取所有楼栋 id
-            List<String> buildingIds = buildingService.queryBuildingIdListByAreaId(buildingId);
+            // 如果是属于华夏的，只需要对应area_id
+            String customName = dealDataService.customName();
+            List<String> buildingIds = new ArrayList<>();
+            if (customName.contains(Constant.CUSTOM_NAME_HUAXIA)) {
+                String areaId = areaService.selectById(buildingId).getAreaId();
+                buildingIds.add(areaId);
+            } else {
+                buildingIds = buildingService.queryBuildingIdListByAreaId(buildingId);
+            }
             if(type==1) {
                 list=energyMapper.getAreaEnergyDay(buildingIds,startDate,endDate, page, limit, areaEntity.getAreaName());
             }else if (type==2){
diff --git a/user-service/src/main/java/com/mh/user/service/impl/SummaryServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/SummaryServiceImpl.java
index 1e0e601..8dfd4e0 100644
--- a/user-service/src/main/java/com/mh/user/service/impl/SummaryServiceImpl.java
+++ b/user-service/src/main/java/com/mh/user/service/impl/SummaryServiceImpl.java
@@ -1,11 +1,14 @@
 package com.mh.user.service.impl;
 
+import com.mh.user.constants.Constant;
 import com.mh.user.entity.AlarmInfoSumEntity;
 import com.mh.user.entity.DeviceStateEntity;
 import com.mh.user.entity.EnergySumEntity;
 import com.mh.user.entity.MaintainSumEntity;
+import com.mh.user.mapper.AreaMapper;
 import com.mh.user.mapper.SummaryMapper;
 import com.mh.user.service.BuildingService;
+import com.mh.user.service.DealDataService;
 import com.mh.user.service.SummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +32,11 @@ public class SummaryServiceImpl implements SummaryService {
     @Autowired
     private BuildingService buildingService;
 
+    @Autowired
+    private DealDataService dealDataService;
+    @Autowired
+    private AreaMapper areaMapper;
+
     @Override
     public DeviceStateEntity queryDeviceState() {
         return summaryMapper.queryDeviceState();
@@ -39,7 +47,15 @@ public class SummaryServiceImpl implements SummaryService {
         // 判断层级属于校区
         if (level == 1) {
             // 根据buildingId查询对应的所有楼栋id
-            List<String> strings = buildingService.queryBuildingIdListByAreaId(buildingId);
+            // 如果是属于华夏的，只需要对应area_id
+            String customName = dealDataService.customName();
+            List<String> strings = new ArrayList<>();
+            if (customName.contains(Constant.CUSTOM_NAME_HUAXIA)) {
+                String areaId = areaMapper.selectById(buildingId).getAreaId();
+                strings.add(areaId);
+            } else {
+                strings = buildingService.queryBuildingIdListByAreaId(buildingId);
+            }
             // 查询所有楼栋人数
             int count = buildingService.queryCheckInCount(buildingId);
             // 遍历楼栋id，查询所有楼栋的energySum