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

平台修改意见20251120-设备列表查询接口增加设备类型参数

Browse Source
This commit is contained in:
zq
2025-12-15 11:07:14 +08:00
parent 7b25674a25
commit 3611e444da
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ public interface EmsSiteSettingMapper
* 获取站点的设备列表
* @return
*/
public List<SiteDeviceListVo> getAllSiteDeviceList(String siteId);
public List<SiteDeviceListVo> getAllSiteDeviceList(@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

@ -25,7 +25,7 @@ public interface IEmsSiteService
public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime);
public List<SiteDeviceListVo> getAllDeviceList(String siteId);
public List<SiteDeviceListVo> getAllDeviceList(String siteId, String deviceCategory);
public List<Map<String,Object>> getAllPcsInfo(String siteId);

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

@ -80,20 +80,20 @@ public class EmsSiteServiceImpl implements IEmsSiteService
* @return
*/
@Override
public List<SiteDeviceListVo> getAllDeviceList(String siteId) {
List<SiteDeviceListVo> resultData = emsSiteMapper.getAllSiteDeviceList(siteId);
public List<SiteDeviceListVo> getAllDeviceList(String siteId, String deviceCategory) {
List<SiteDeviceListVo> resultData = emsSiteMapper.getAllSiteDeviceList(siteId, deviceCategory);
if(resultData == null || resultData.size() == 0){
return resultData;
}
for (SiteDeviceListVo siteDeviceListVo : resultData) {
String clusterId = siteDeviceListVo.getDeviceId();
String deviceCategory = siteDeviceListVo.getDeviceCategory();
if(DeviceCategory.CLUSTER.getCode().equals(deviceCategory)){
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(deviceCategory);
String categoryName = DeviceCategory.getInfoByCode(category);
siteDeviceListVo.setCategoryName(categoryName);
}
return resultData;