xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备列表不展示display_flg=1的数据

Browse Source
This commit is contained in:
dashixiong
2026-01-22 15:08:39 +08:00
parent ecc4799afd
commit 46ea4acc2c
5 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
View File

@ -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();
}

2
ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
View File

@ -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);

25
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
View File

@ -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