diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java index f1df91e..9d241f7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java @@ -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() { diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java index 65ca69f..cf4cde7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java @@ -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); diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index c3ecfd2..c81b63c 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -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); } diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index 574002f..19dba5b 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -190,6 +190,7 @@ select DISTINCT t1.device_id as id, t1.device_name as deviceName, t1.communication_status as communicationStatus, + t1.device_status as deviceStatus, t1.parent_id as parentDeviceId, t2.device_name as parentDeviceName from ems_devices_setting t1 diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml index 5d4f681..1d1d2ad 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml @@ -136,7 +136,7 @@