diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java index bebfb80..746a5d6 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java @@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel; * PCS数据对象 ems_pcs_data * * @author xzzn - * @date 2025-06-29 + * @date 2025-07-07 */ public class EmsPcsData extends BaseEntity { @@ -26,20 +26,20 @@ public class EmsPcsData extends BaseEntity @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date dataUpdateTime; - /** 工作状态 */ - @Excel(name = "工作状态") + /** 工作状态:0-正常 1-异常 2-停止 */ + @Excel(name = "工作状态:0-正常 1-异常 2-停止") private String workStatus; - /** 并网状态 */ - @Excel(name = "并网状态") + /** 并网状态:0-并网 1-未并网 */ + @Excel(name = "并网状态:0-并网 1-未并网") private String gridStatus; - /** 设备状态 */ - @Excel(name = "设备状态") + /** 设备状态:0-在线 1-离线 2-维修中 */ + @Excel(name = "设备状态:0-在线 1-离线 2-维修中") private String deviceStatus; - /** 控制模式 */ - @Excel(name = "控制模式") + /** 控制模式:0-远程 1-本地 */ + @Excel(name = "控制模式:0-远程 1-本地") private String controlMode; /** 总交流有功电率 (kW) */ @@ -102,12 +102,12 @@ public class EmsPcsData extends BaseEntity @Excel(name = "交流频率 (Hz)") private BigDecimal acFrequency; - /** 支路状态 */ - @Excel(name = "支路状态") + /** 支路状态:0-备用 1-正常 2-切换中 */ + @Excel(name = "支路状态:0-备用 1-正常 2-切换中") private String branchStatus; - /** 放电状态 */ - @Excel(name = "放电状态") + /** 放电状态:0-充电中 1-待机 */ + @Excel(name = "放电状态:0-充电中 1-待机") private String dischargeStatus; /** 直流功率 (kW) */ @@ -190,6 +190,18 @@ public class EmsPcsData extends BaseEntity @Excel(name = "远程投退状态") private String remoteControlStatus; + /** 系统输出U相电流 */ + @Excel(name = "系统输出U相电流") + private BigDecimal sysUCurrent; + + /** 系统输出V相电流 */ + @Excel(name = "系统输出V相电流") + private BigDecimal sysVCurrent; + + /** 系统输出W相电流 */ + @Excel(name = "系统输出W相电流") + private BigDecimal sysWCurrent; + public void setId(Long id) { this.id = id; @@ -620,6 +632,36 @@ public class EmsPcsData extends BaseEntity return remoteControlStatus; } + public void setSysUCurrent(BigDecimal sysUCurrent) + { + this.sysUCurrent = sysUCurrent; + } + + public BigDecimal getSysUCurrent() + { + return sysUCurrent; + } + + public void setSysVCurrent(BigDecimal sysVCurrent) + { + this.sysVCurrent = sysVCurrent; + } + + public BigDecimal getSysVCurrent() + { + return sysVCurrent; + } + + public void setSysWCurrent(BigDecimal sysWCurrent) + { + this.sysWCurrent = sysWCurrent; + } + + public BigDecimal getSysWCurrent() + { + return sysWCurrent; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -671,6 +713,9 @@ public class EmsPcsData extends BaseEntity .append("acSwitchStatus", getAcSwitchStatus()) .append("dcSwitchStatus", getDcSwitchStatus()) .append("remoteControlStatus", getRemoteControlStatus()) + .append("sysUCurrent", getSysUCurrent()) + .append("sysVCurrent", getSysVCurrent()) + .append("sysWCurrent", getSysWCurrent()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java index 87e0733..61b32e9 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java @@ -334,6 +334,11 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { String controlMode = StringUtils.getString(obj.get("YCTT")); pcsData.setRemoteControlStatus(ControlModeStatus.REMOTE.getCode()); + // 电流参数 + pcsData.setSysUCurrent(StringUtils.getBigDecimal(obj.get("XTSCUXDL"))); + pcsData.setSysVCurrent(StringUtils.getBigDecimal(obj.get("XTSCVXDL"))); + pcsData.setSysWCurrent(StringUtils.getBigDecimal(obj.get("XTSCWXDL"))); + // 直流参数 // pcsData.setDcVoltage(StringUtils.getBigDecimal(obj.get("ChargeableCapacity"))); // pcsData.setDcCurrent(StringUtils.getBigDecimal(obj.get("ChargeableCapacity"))); diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index bb20358..a6f1ae8 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -53,10 +53,13 @@ + + + - select id, data_update_time, work_status, grid_status, device_status, control_mode, total_active_power, daily_ac_charge_energy, a_phase_voltage, a_phase_current, total_reactive_power, daily_ac_discharge_energy, b_phase_voltage, b_phase_current, total_apparent_power, pcs_module_temperature, c_phase_voltage, c_phase_current, total_power_factor, pcs_environment_temperature, ac_frequency, branch_status, discharge_status, dc_power, dc_voltage, dc_current, create_by, create_time, update_by, update_time, remark, site_id, device_id, date_month, date_day, total_ac_charge_energy, total_ac_discharge_energy, ac_charge_active_power, ac_capacitive_reactive_power, ac_discharge_active_power, ac_inductive_reactive_power, max_capacitive_power_capacity, max_inductive_power_capacity, max_charge_power_capacity, max_discharge_power_capacity, ac_switch_status, dc_switch_status, remote_control_status from ems_pcs_data + select id, data_update_time, work_status, grid_status, device_status, control_mode, total_active_power, daily_ac_charge_energy, a_phase_voltage, a_phase_current, total_reactive_power, daily_ac_discharge_energy, b_phase_voltage, b_phase_current, total_apparent_power, pcs_module_temperature, c_phase_voltage, c_phase_current, total_power_factor, pcs_environment_temperature, ac_frequency, branch_status, discharge_status, dc_power, dc_voltage, dc_current, create_by, create_time, update_by, update_time, remark, site_id, device_id, date_month, date_day, total_ac_charge_energy, total_ac_discharge_energy, ac_charge_active_power, ac_capacitive_reactive_power, ac_discharge_active_power, ac_inductive_reactive_power, max_capacitive_power_capacity, max_inductive_power_capacity, max_charge_power_capacity, max_discharge_power_capacity, ac_switch_status, dc_switch_status, remote_control_status, sys_u_current, sys_v_current, sys_w_current from ems_pcs_data @@ -162,6 +168,9 @@ ac_switch_status, dc_switch_status, remote_control_status, + sys_u_current, + sys_v_current, + sys_w_current, #{dataUpdateTime}, @@ -211,6 +220,9 @@ #{acSwitchStatus}, #{dcSwitchStatus}, #{remoteControlStatus}, + #{sysUCurrent}, + #{sysVCurrent}, + #{sysWCurrent}, @@ -264,6 +276,9 @@ ac_switch_status = #{acSwitchStatus}, dc_switch_status = #{dcSwitchStatus}, remote_control_status = #{remoteControlStatus}, + sys_u_current = #{sysUCurrent}, + sys_v_current = #{sysVCurrent}, + sys_w_current = #{sysWCurrent}, where id = #{id}