From 46ea4acc2c8f4bc100240221c578613f396eec70 Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Thu, 22 Jan 2026 15:08:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BAdisplay=5Fflg=3D1=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ems/EmsSiteConfigController.java          |  3 ++-
 .../xzzn/ems/mapper/EmsSiteSettingMapper.java |  3 +++
 .../com/xzzn/ems/service/IEmsSiteService.java |  2 ++
 .../ems/service/impl/EmsSiteServiceImpl.java  | 25 +++++++++++++++++++
 .../mapper/ems/EmsSiteSettingMapper.xml       | 18 +++++++++++++
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
index d4104b0..aec2ad4 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -67,7 +67,8 @@ public class EmsSiteConfigController extends BaseController{
                                            @RequestParam(value = "deviceCategory", required = false) String deviceCategory)
     {
         startPage();
-        List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId, deviceCategory);
+        List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceListNoDisp(siteId, deviceCategory);
+
         return getDataTable(list);
     }
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
index 931ff3d..5507928 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
@@ -91,5 +91,8 @@ public interface EmsSiteSettingMapper
      */
     public List<SiteDeviceListVo> getAllSiteDeviceList(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory);
 
+
+    public List<SiteDeviceListVo> getAllSiteDeviceListNoDisp(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory);
+
     public List<String> getAllSiteId();
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
index ed853ac..298266f 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
@@ -27,6 +27,8 @@ public interface IEmsSiteService
 
     public List<SiteDeviceListVo> getAllDeviceList(String siteId, String deviceCategory);
 
+    public List<SiteDeviceListVo> getAllDeviceListNoDisp(String siteId, String deviceCategory);
+
     public List<Map<String,Object>> getAllPcsInfo(String siteId);
 
     public List<Map<String,Object>> getParentCategoryDeviceId(String siteId, String deviceCategory);
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
index ea6ccde..1abb914 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
@@ -99,6 +99,31 @@ public class EmsSiteServiceImpl implements IEmsSiteService
         return resultData;
     }
 
+    /**
+     * 获取设备列表
+     *
+     * @param siteId
+     * @return
+     */
+    @Override
+    public List<SiteDeviceListVo> getAllDeviceListNoDisp(String siteId, String deviceCategory) {
+        List<SiteDeviceListVo> resultData = emsSiteMapper.getAllSiteDeviceListNoDisp(siteId, deviceCategory);
+        if(resultData == null || resultData.size() == 0){
+            return resultData;
+        }
+        for (SiteDeviceListVo siteDeviceListVo : resultData) {
+            String clusterId = siteDeviceListVo.getDeviceId();
+            String category = siteDeviceListVo.getDeviceCategory();
+            if(DeviceCategory.CLUSTER.getCode().equals(category)){
+                // 获取该stack下面有多少单体电池
+                List<EmsBatteryData> batteryDataList = redisCache.getCacheList(RedisKeyConstants.BATTERY + siteId + "_" + clusterId);
+                siteDeviceListVo.setBatteryNum(batteryDataList == null ? 0 : batteryDataList.size());
+            }
+            String categoryName = DeviceCategory.getInfoByCode(category);
+            siteDeviceListVo.setCategoryName(categoryName);
+        }
+        return resultData;
+    }
     /**
      * 根据site_id获取所有pcs
      * @param siteId
diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
index 086ed2e..c7e0fa9 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
@@ -152,6 +152,24 @@
         order by ed.device_id
     </select>
 
+    <select id="getAllSiteDeviceListNoDisp" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteDeviceListVo">
+        select  es.site_id as siteId,es.site_name as siteName,
+        ed.device_id as deviceId,ed.device_name as deviceName,
+        ed.device_type as deviceType,ed.device_status as deviceStatus,ed.work_status as workStatus,
+        ed.device_category as deviceCategory,
+        ed.picture_url as pictureUrl,
+        ed.id,
+        ed.parent_id as parentId
+        from ems_site_setting es INNER JOIN ems_devices_setting ed on es.site_id = ed.site_id and (ed.display_flg is null or ed.display_flg != '1')
+        where 1 = 1
+        <if test="siteId != null and siteId != ''">
+            and es.site_id = #{siteId}
+        </if>
+        <if test="deviceCategory != null and deviceCategory != ''">
+            and ed.device_category = #{deviceCategory}
+        </if>
+        order by ed.device_id
+    </select>
     <select id="getAllSiteId"  resultType="String">
         select distinct site_id from ems_site_setting
     </select>

From f592b709a7ed9b87d7e97ee776269a324929b088 Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Thu, 22 Jan 2026 16:06:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index ecdedb8..d428739 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -398,7 +398,7 @@
             AND latest.max_update_time = t.data_update_time
             AND t.site_id = #{siteId}
              ) AS pd
-        WHERE rn = 1;
+        WHERE rn = 1
     </select>
 
     <select id="getElectDataList" resultType="com.xzzn.ems.domain.vo.ElectricIndexList">