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

平台修改意见20251120-统一PCS页面与设备列表页面的设备状态取值字段

Browse Source
This commit is contained in:
zq
2025-12-12 11:06:22 +08:00
parent 0e1c7f52f1
commit e73787ee8f
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java
View File

@ -16,7 +16,7 @@ public class SiteDeviceListVo {
/** 设备类型 */
private String deviceType;
/** 运行状态 */
private String runningStatus;
private String deviceStatus;
/** 设备类型 */
private String deviceCategory;
/** 设备类型 */
@ -78,12 +78,12 @@ public class SiteDeviceListVo {
this.deviceType = deviceType;
}
public String getRunningStatus() {
return runningStatus;
public String getDeviceStatus() {
return deviceStatus;
}
public void setRunningStatus(String runningStatus) {
this.runningStatus = runningStatus;
public void setDeviceStatus(String deviceStatus) {
this.deviceStatus = deviceStatus;
}
public String getDeviceCategory() {

6
ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
View File

@ -774,6 +774,12 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
emsPcsDataMapper.insertEmsPcsData(pcsData);
redisCache.setCacheObject(RedisKeyConstants.PCS + siteId + "_" + deviceId, pcsData);
// 同步更新PCS设备状态
// EmsDevicesSetting emsDevicesSetting = emsDevicesSettingMapper.getDeviceBySiteAndDeviceId(deviceId, siteId);
// emsDevicesSetting.setDeviceStatus(pcsData.getDeviceStatus());
// emsDevicesSetting.setUpdatedAt(DateUtils.getNowDate());
// emsDevicesSettingMapper.updateEmsDevicesSetting(emsDevicesSetting);
if (SiteEnum.FX.getCode().equals(siteId)) {
//更新每日充放电数据
dealFXXDailyChargeDate(siteId, deviceId, pcsData);

1
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

@ -438,6 +438,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// // 报警个数
// int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId);
pcsDetailInfoVo.setAlarmNum(alarmNum);
pcsDetailInfoVo.setDeviceStatus(pcsDevice.get("deviceStatus") == null ? "" : pcsDevice.get("deviceStatus").toString());
pcsDetailInfoVoList.add(pcsDetailInfoVo);
}