diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java index b3b6b61..53bb893 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java @@ -406,6 +406,38 @@ public class EmsAmmeterData extends BaseEntity @Excel(name = "正向有功电能 EP+") private BigDecimal positiveActiveEnergyEpPlus; + /** 吸收有功电度二次侧 */ + @Excel(name = "吸收有功电度二次侧") + private BigDecimal absorbsActiveEnerygSecondSide; + + /** 释放有功电度二次侧 */ + @Excel(name = "释放有功电度二次侧") + private BigDecimal releaseActiveEnerygSecondSide; + + /** 感性无功电度二次侧 */ + @Excel(name = "感性无功电度二次侧") + private BigDecimal inductorReactiveEnerySecondeSide; + + /** 容性无功电度二次侧 */ + @Excel(name = "容性无功电度二次侧") + private BigDecimal capacitorReactiveEnerySecondeSide; + + /** 吸收有功电度一次侧 */ + @Excel(name = "吸收有功电度一次侧") + private BigDecimal absorbsActiveEnerygOneSide; + + /** 释放有功电度一次侧 */ + @Excel(name = "释放有功电度一次侧") + private BigDecimal releaseActiveEnerygOneSide; + + /** 感性无功电度一次侧 */ + @Excel(name = "感性无功电度一次侧") + private BigDecimal inductorReactiveEneryOneSide; + + /** 容性无功电度一次侧 */ + @Excel(name = "容性无功电度一次侧") + private BigDecimal capacitorReactiveEneryOneSide; + public void setId(Long id) { this.id = id; @@ -1376,6 +1408,86 @@ public class EmsAmmeterData extends BaseEntity return positiveActiveEnergyEpPlus; } + public void setAbsorbsActiveEnerygSecondSide(BigDecimal absorbsActiveEnerygSecondSide) + { + this.absorbsActiveEnerygSecondSide = absorbsActiveEnerygSecondSide; + } + + public BigDecimal getAbsorbsActiveEnerygSecondSide() + { + return absorbsActiveEnerygSecondSide; + } + + public void setReleaseActiveEnerygSecondSide(BigDecimal releaseActiveEnerygSecondSide) + { + this.releaseActiveEnerygSecondSide = releaseActiveEnerygSecondSide; + } + + public BigDecimal getReleaseActiveEnerygSecondSide() + { + return releaseActiveEnerygSecondSide; + } + + public void setInductorReactiveEnerySecondeSide(BigDecimal inductorReactiveEnerySecondeSide) + { + this.inductorReactiveEnerySecondeSide = inductorReactiveEnerySecondeSide; + } + + public BigDecimal getInductorReactiveEnerySecondeSide() + { + return inductorReactiveEnerySecondeSide; + } + + public void setCapacitorReactiveEnerySecondeSide(BigDecimal capacitorReactiveEnerySecondeSide) + { + this.capacitorReactiveEnerySecondeSide = capacitorReactiveEnerySecondeSide; + } + + public BigDecimal getCapacitorReactiveEnerySecondeSide() + { + return capacitorReactiveEnerySecondeSide; + } + + public void setAbsorbsActiveEnerygOneSide(BigDecimal absorbsActiveEnerygOneSide) + { + this.absorbsActiveEnerygOneSide = absorbsActiveEnerygOneSide; + } + + public BigDecimal getAbsorbsActiveEnerygOneSide() + { + return absorbsActiveEnerygOneSide; + } + + public void setReleaseActiveEnerygOneSide(BigDecimal releaseActiveEnerygOneSide) + { + this.releaseActiveEnerygOneSide = releaseActiveEnerygOneSide; + } + + public BigDecimal getReleaseActiveEnerygOneSide() + { + return releaseActiveEnerygOneSide; + } + + public void setInductorReactiveEneryOneSide(BigDecimal inductorReactiveEneryOneSide) + { + this.inductorReactiveEneryOneSide = inductorReactiveEneryOneSide; + } + + public BigDecimal getInductorReactiveEneryOneSide() + { + return inductorReactiveEneryOneSide; + } + + public void setCapacitorReactiveEneryOneSide(BigDecimal capacitorReactiveEneryOneSide) + { + this.capacitorReactiveEneryOneSide = capacitorReactiveEneryOneSide; + } + + public BigDecimal getCapacitorReactiveEneryOneSide() + { + return capacitorReactiveEneryOneSide; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -1481,6 +1593,14 @@ public class EmsAmmeterData extends BaseEntity .append("reverseActiveEnergyEpMinus", getReverseActiveEnergyEpMinus()) .append("positiveReactiveEnergyEqPlus", getPositiveReactiveEnergyEqPlus()) .append("positiveActiveEnergyEpPlus", getPositiveActiveEnergyEpPlus()) + .append("absorbsActiveEnerygSecondSide", getAbsorbsActiveEnerygSecondSide()) + .append("releaseActiveEnerygSecondSide", getReleaseActiveEnerygSecondSide()) + .append("inductorReactiveEnerySecondeSide", getInductorReactiveEnerySecondeSide()) + .append("capacitorReactiveEnerySecondeSide", getCapacitorReactiveEnerySecondeSide()) + .append("absorbsActiveEnerygOneSide", getAbsorbsActiveEnerygOneSide()) + .append("releaseActiveEnerygOneSide", getReleaseActiveEnerygOneSide()) + .append("inductorReactiveEneryOneSide", getInductorReactiveEneryOneSide()) + .append("capacitorReactiveEneryOneSide", getCapacitorReactiveEneryOneSide()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java index 7f50754..4bf03bb 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java @@ -310,9 +310,9 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { pcsData.setControlMode(ControlModeStatus.REMOTE.getCode()); // 功率与能量类字段 - pcsData.setTotalActivePower(StringUtils.getBigDecimal(obj.get("YGGL"))); + pcsData.setTotalActivePower(StringUtils.getBigDecimal(obj.get("JLYGGL"))); pcsData.setDailyAcChargeEnergy(StringUtils.getBigDecimal(obj.get("RCDL"))); - pcsData.setTotalReactivePower(StringUtils.getBigDecimal(obj.get("XTWGGL"))); + pcsData.setTotalReactivePower(StringUtils.getBigDecimal(obj.get("JLWGGL"))); pcsData.setDailyAcDischargeEnergy(StringUtils.getBigDecimal(obj.get("RFDL"))); pcsData.setTotalApparentPower(StringUtils.getBigDecimal(obj.get("XTSZGL"))); pcsData.setTotalPowerFactor(StringUtils.getBigDecimal(obj.get("GLYS"))); @@ -425,54 +425,17 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { // 更新时间 dataLoad.setDataUpdateTime(new Date()); - // 电能设置-组合有功 - dataLoad.setCurrentCombActiveTotal(StringUtils.getBigDecimal(obj.get("DQZHYGZDN"))); - dataLoad.setCurrentCombActivePeak(StringUtils.getBigDecimal(obj.get("DQZHYGJDN"))); - dataLoad.setCurrentCombActiveHigh(StringUtils.getBigDecimal(obj.get("DQZHYGFDN"))); - dataLoad.setCurrentCombActiveFlat(StringUtils.getBigDecimal(obj.get("DQZHYGPDN"))); - dataLoad.setCurrentCombActiveValley(StringUtils.getBigDecimal(obj.get("DQZHYGGDN"))); - // 电能设置-正向有功 - dataLoad.setCurrentForwardActiveTotal(StringUtils.getBigDecimal(obj.get("DQZXYGZDN"))); - dataLoad.setCurrentForwardActivePeak(StringUtils.getBigDecimal(obj.get("DQZXYGJDN"))); - dataLoad.setCurrentForwardActiveHigh(StringUtils.getBigDecimal(obj.get("DQZXYGFDN"))); - dataLoad.setCurrentForwardActiveFlat(StringUtils.getBigDecimal(obj.get("DQZXYGPDN"))); - dataLoad.setCurrentForwardActiveValley(StringUtils.getBigDecimal(obj.get("DQZXYGGDN"))); - // 电能设置-反向有功 - dataLoad.setCurrentReverseActiveTotal(StringUtils.getBigDecimal(obj.get("DQFXYGZDN"))); - dataLoad.setCurrentReverseActivePeak(StringUtils.getBigDecimal(obj.get("DQFXYGJDN"))); - dataLoad.setCurrentReverseActiveHigh(StringUtils.getBigDecimal(obj.get("DQFXYGFDN"))); - dataLoad.setCurrentReverseActiveFlat(StringUtils.getBigDecimal(obj.get("DQFXYGPDN"))); - dataLoad.setCurrentReverseActiveValley(StringUtils.getBigDecimal(obj.get("DQFXYGGDN"))); - // 电能设置-组合无功 - dataLoad.setCurrentCombReactiveTotal(StringUtils.getBigDecimal(obj.get("DQZHWGZDN"))); - dataLoad.setCurrentCombReactivePeak(StringUtils.getBigDecimal(obj.get("DQZHWGJDN"))); - dataLoad.setCurrentCombReactiveHigh(StringUtils.getBigDecimal(obj.get("DQZHWGFDN"))); - dataLoad.setCurrentCombReactiveFlat(StringUtils.getBigDecimal(obj.get("DQZHWGPDN"))); - dataLoad.setCurrentCombReactiveValley(StringUtils.getBigDecimal(obj.get("DQZHWGGDN"))); - // 电能设置-正向无功 - dataLoad.setCurrentForwardReactiveTotal(StringUtils.getBigDecimal(obj.get("DQZXWGZDN"))); - dataLoad.setCurrentForwardReactivePeak(StringUtils.getBigDecimal(obj.get("DQZXWGJDN"))); - dataLoad.setCurrentForwardReactiveHigh(StringUtils.getBigDecimal(obj.get("DQZXWGFDN"))); - dataLoad.setCurrentForwardReactiveFlat(StringUtils.getBigDecimal(obj.get("DQZXWGPDN"))); - dataLoad.setCurrentForwardReactiveValley(StringUtils.getBigDecimal(obj.get("DQZXWGGDN"))); - // 电能设置-反向无功 - dataLoad.setCurrentReverseReactiveTotal(StringUtils.getBigDecimal(obj.get("DQFXWGZDN"))); - dataLoad.setCurrentReverseReactivePeak(StringUtils.getBigDecimal(obj.get("DQFXWGJDN"))); - dataLoad.setCurrentReverseReactiveHigh(StringUtils.getBigDecimal(obj.get("DQFXWGFDN"))); - dataLoad.setCurrentReverseReactiveFlat(StringUtils.getBigDecimal(obj.get("DQFXWGPDN"))); - dataLoad.setCurrentReverseReactiveValley(StringUtils.getBigDecimal(obj.get("DQFXWGGDN"))); + // 电压+电流 - dds字段 + dataLoad.setPhaseAVoltage(StringUtils.getBigDecimal(obj.get("XDYUA"))); + dataLoad.setPhaseBVoltage(StringUtils.getBigDecimal(obj.get("XDYUB"))); + dataLoad.setPhaseCVoltage(StringUtils.getBigDecimal(obj.get("XDYUC"))); + dataLoad.setPhaseACurrent(StringUtils.getBigDecimal(obj.get("XDLIA"))); + dataLoad.setPhaseBCurrent(StringUtils.getBigDecimal(obj.get("XDLIB"))); + dataLoad.setPhaseCCurrent(StringUtils.getBigDecimal(obj.get("XDLIC"))); - // 电压+电流 - dataLoad.setPhaseAVoltage(StringUtils.getBigDecimal(obj.get("AXDY"))); - dataLoad.setPhaseBVoltage(StringUtils.getBigDecimal(obj.get("BXDY"))); - dataLoad.setPhaseCVoltage(StringUtils.getBigDecimal(obj.get("CXDY"))); - dataLoad.setPhaseACurrent(StringUtils.getBigDecimal(obj.get("AXDL"))); - dataLoad.setPhaseBCurrent(StringUtils.getBigDecimal(obj.get("BXDL"))); - dataLoad.setPhaseCCurrent(StringUtils.getBigDecimal(obj.get("CXDL"))); - - dataLoad.setAbLineVoltage(StringUtils.getBigDecimal(obj.get("ABXDY"))); - dataLoad.setCbLineVoltage(StringUtils.getBigDecimal(obj.get("CBXDY"))); - dataLoad.setAcLineVoltage(StringUtils.getBigDecimal(obj.get("ACXDY"))); + dataLoad.setAbLineVoltage(StringUtils.getBigDecimal(obj.get("XDYUAB"))); + dataLoad.setCbLineVoltage(StringUtils.getBigDecimal(obj.get("XDYUBC"))); + dataLoad.setAcLineVoltage(StringUtils.getBigDecimal(obj.get("XDYUCA"))); // 频率 dataLoad.setFrequency(StringUtils.getBigDecimal(obj.get("PL"))); @@ -481,11 +444,11 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { dataLoad.setPhaseAActivePower(StringUtils.getBigDecimal(obj.get("AXYGGL"))); dataLoad.setPhaseBActivePower(StringUtils.getBigDecimal(obj.get("BXYGGL"))); dataLoad.setPhaseCActivePower(StringUtils.getBigDecimal(obj.get("CXYGGL"))); - dataLoad.setTotalActivePower(StringUtils.getBigDecimal(obj.get("ZYGGL"))); + dataLoad.setTotalActivePower(StringUtils.getBigDecimal(obj.get("YGZGL"))); dataLoad.setPhaseAReactivePower(StringUtils.getBigDecimal(obj.get("AXWGGL"))); dataLoad.setPhaseBReactivePower(StringUtils.getBigDecimal(obj.get("BXWGGL"))); dataLoad.setPhaseCReactivePower(StringUtils.getBigDecimal(obj.get("CXWGGL"))); - dataLoad.setTotalReactivePower(StringUtils.getBigDecimal(obj.get("ZWGGL"))); + dataLoad.setTotalReactivePower(StringUtils.getBigDecimal(obj.get("WGZGL"))); dataLoad.setPhaseAApparentPower(StringUtils.getBigDecimal(obj.get("AXSZGL"))); dataLoad.setPhaseBApparentPower(StringUtils.getBigDecimal(obj.get("BXSZGL"))); dataLoad.setPhaseCApparentPower(StringUtils.getBigDecimal(obj.get("CXSZGL"))); @@ -502,6 +465,16 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { dataLoad.setReverseAcMaxDemand(StringUtils.getBigDecimal(obj.get("FXYGZDXL"))); dataLoad.setDailyForwardMaxDemand(StringUtils.getBigDecimal(obj.get("DRZXYGZDXL"))); + // 电度 + dataLoad.setAbsorbsActiveEnerygSecondSide(StringUtils.getBigDecimal(obj.get("XSYGDDECC"))); + dataLoad.setReleaseActiveEnerygSecondSide(StringUtils.getBigDecimal(obj.get("SFTGDDECC"))); + dataLoad.setInductorReactiveEnerySecondeSide(StringUtils.getBigDecimal(obj.get("GXWGDDECC"))); + dataLoad.setCapacitorReactiveEnerySecondeSide(StringUtils.getBigDecimal(obj.get("RXWGDDECC"))); + dataLoad.setAbsorbsActiveEnerygOneSide(StringUtils.getBigDecimal(obj.get("XSYGDDYCC"))); + dataLoad.setReleaseActiveEnerygOneSide(StringUtils.getBigDecimal(obj.get("SFYGDDYCC"))); + dataLoad.setInductorReactiveEneryOneSide(StringUtils.getBigDecimal(obj.get("GXWGDDYCC"))); + dataLoad.setCapacitorReactiveEneryOneSide(StringUtils.getBigDecimal(obj.get("RXWGDDYCC"))); + dataLoad.setCreateBy("system"); dataLoad.setCreateTime(DateUtils.getNowDate()); dataLoad.setUpdateBy("system"); 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 27effc9..8ddb8bd 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 @@ -388,8 +388,8 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService { data.setDcPower(StringUtils.getBigDecimal(fields.get("ZLGL"))); data.setDcVoltage(StringUtils.getBigDecimal(fields.get("ZLDY"))); data.setDcCurrent(StringUtils.getBigDecimal(fields.get("ZLDL"))); - data.setGridUVoltage(StringUtils.getBigDecimal(fields.get("DWVXDY"))); - data.setGridVVoltage(StringUtils.getBigDecimal(fields.get("DWUXDY"))); + data.setGridUVoltage(StringUtils.getBigDecimal(fields.get("DWUXDY"))); + data.setGridVVoltage(StringUtils.getBigDecimal(fields.get("DWVXDY"))); data.setGridWVoltage(StringUtils.getBigDecimal(fields.get("DWWXDY"))); data.setOutputUCurrent(StringUtils.getBigDecimal(fields.get("SCUXDL"))); data.setOutputVCurrent(StringUtils.getBigDecimal(fields.get("SCVXDL"))); diff --git a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml index 23e41eb..0c27240 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml @@ -107,10 +107,18 @@ + + + + + + + + - select id, data_update_time, current_comb_active_total, current_comb_active_peak, current_comb_active_high, current_comb_active_flat, current_comb_active_valley, current_forward_active_total, current_forward_active_peak, current_forward_active_high, current_forward_active_flat, current_forward_active_valley, current_reverse_active_total, current_reverse_active_peak, current_reverse_active_high, current_reverse_active_flat, current_reverse_active_valley, current_comb_reactive_total, current_comb_reactive_peak, current_comb_reactive_high, current_comb_reactive_flat, current_comb_reactive_valley, current_forward_reactive_total, current_forward_reactive_peak, current_forward_reactive_high, current_forward_reactive_flat, current_forward_reactive_valley, current_reverse_reactive_total, current_reverse_reactive_peak, current_reverse_reactive_high, current_reverse_reactive_flat, current_reverse_reactive_valley, phase_a_voltage, phase_b_voltage, phase_c_voltage, phase_a_current, phase_b_current, phase_c_current, frequency, ab_line_voltage, cb_line_voltage, ac_line_voltage, forward_ac_max_demand, reverse_ac_max_demand, phase_a_active_power, phase_b_active_power, phase_c_active_power, total_active_power, phase_a_reactive_power, phase_b_reactive_power, phase_c_reactive_power, total_reactive_power, phase_a_apparent_power, phase_b_apparent_power, phase_c_apparent_power, total_apparent_power, phase_a_power_factor, phase_b_power_factor, phase_c_power_factor, total_power_factor, daily_forward_max_demand, site_id, device_id, create_by, create_time, update_by, update_time, remark, secondary_ab_line_voltage, secondary_a_phase_current, secondary_a_phase_voltage, secondary_a_power_factor, secondary_a_apparent_power, secondary_a_reactive_power, secondary_a_active_power, secondary_bc_line_voltage, secondary_b_phase_current, secondary_b_phase_voltage, secondary_b_power_factor, secondary_b_apparent_power, secondary_b_reactive_power, secondary_b_active_power, secondary_ca_line_voltage, secondary_c_phase_current, secondary_c_phase_voltage, secondary_c_power_factor, secondary_c_apparent_power, secondary_c_reactive_power, secondary_c_active_power, secondary_grid_frequency, secondary_reverse_reactive_energy, secondary_negative_active_energy, secondary_total_power_factor, secondary_total_apparent_power, secondary_total_reactive_power, secondary_positive_reactive_energy, secondary_positive_active_energy, secondary_total_active_power, reverse_reactive_energy_eq_minus, reverse_active_energy_ep_minus, positive_reactive_energy_eq_plus, positive_active_energy_ep_plus from ems_ammeter_data + select id, data_update_time, current_comb_active_total, current_comb_active_peak, current_comb_active_high, current_comb_active_flat, current_comb_active_valley, current_forward_active_total, current_forward_active_peak, current_forward_active_high, current_forward_active_flat, current_forward_active_valley, current_reverse_active_total, current_reverse_active_peak, current_reverse_active_high, current_reverse_active_flat, current_reverse_active_valley, current_comb_reactive_total, current_comb_reactive_peak, current_comb_reactive_high, current_comb_reactive_flat, current_comb_reactive_valley, current_forward_reactive_total, current_forward_reactive_peak, current_forward_reactive_high, current_forward_reactive_flat, current_forward_reactive_valley, current_reverse_reactive_total, current_reverse_reactive_peak, current_reverse_reactive_high, current_reverse_reactive_flat, current_reverse_reactive_valley, phase_a_voltage, phase_b_voltage, phase_c_voltage, phase_a_current, phase_b_current, phase_c_current, frequency, ab_line_voltage, cb_line_voltage, ac_line_voltage, forward_ac_max_demand, reverse_ac_max_demand, phase_a_active_power, phase_b_active_power, phase_c_active_power, total_active_power, phase_a_reactive_power, phase_b_reactive_power, phase_c_reactive_power, total_reactive_power, phase_a_apparent_power, phase_b_apparent_power, phase_c_apparent_power, total_apparent_power, phase_a_power_factor, phase_b_power_factor, phase_c_power_factor, total_power_factor, daily_forward_max_demand, site_id, device_id, create_by, create_time, update_by, update_time, remark, secondary_ab_line_voltage, secondary_a_phase_current, secondary_a_phase_voltage, secondary_a_power_factor, secondary_a_apparent_power, secondary_a_reactive_power, secondary_a_active_power, secondary_bc_line_voltage, secondary_b_phase_current, secondary_b_phase_voltage, secondary_b_power_factor, secondary_b_apparent_power, secondary_b_reactive_power, secondary_b_active_power, secondary_ca_line_voltage, secondary_c_phase_current, secondary_c_phase_voltage, secondary_c_power_factor, secondary_c_apparent_power, secondary_c_reactive_power, secondary_c_active_power, secondary_grid_frequency, secondary_reverse_reactive_energy, secondary_negative_active_energy, secondary_total_power_factor, secondary_total_apparent_power, secondary_total_reactive_power, secondary_positive_reactive_energy, secondary_positive_active_energy, secondary_total_active_power, reverse_reactive_energy_eq_minus, reverse_active_energy_ep_minus, positive_reactive_energy_eq_plus, positive_active_energy_ep_plus, absorbs_active_eneryg_second_side, release_active_eneryg_second_side, inductor_reactive_enery_seconde_side, capacitor_reactive_enery_seconde_side, absorbs_active_eneryg_one_side, release_active_eneryg_one_side, inductor_reactive_enery_one_side, capacitor_reactive_enery_one_side from ems_ammeter_data @@ -324,6 +340,14 @@ reverse_active_energy_ep_minus, positive_reactive_energy_eq_plus, positive_active_energy_ep_plus, + absorbs_active_eneryg_second_side, + release_active_eneryg_second_side, + inductor_reactive_enery_seconde_side, + capacitor_reactive_enery_seconde_side, + absorbs_active_eneryg_one_side, + release_active_eneryg_one_side, + inductor_reactive_enery_one_side, + capacitor_reactive_enery_one_side, #{dataUpdateTime}, @@ -427,6 +451,14 @@ #{reverseActiveEnergyEpMinus}, #{positiveReactiveEnergyEqPlus}, #{positiveActiveEnergyEpPlus}, + #{absorbsActiveEnerygSecondSide}, + #{releaseActiveEnerygSecondSide}, + #{inductorReactiveEnerySecondeSide}, + #{capacitorReactiveEnerySecondeSide}, + #{absorbsActiveEnerygOneSide}, + #{releaseActiveEnerygOneSide}, + #{inductorReactiveEneryOneSide}, + #{capacitorReactiveEneryOneSide}, @@ -534,6 +566,14 @@ reverse_active_energy_ep_minus = #{reverseActiveEnergyEpMinus}, positive_reactive_energy_eq_plus = #{positiveReactiveEnergyEqPlus}, positive_active_energy_ep_plus = #{positiveActiveEnergyEpPlus}, + absorbs_active_eneryg_second_side = #{absorbsActiveEnerygSecondSide}, + release_active_eneryg_second_side = #{releaseActiveEnerygSecondSide}, + inductor_reactive_enery_seconde_side = #{inductorReactiveEnerySecondeSide}, + capacitor_reactive_enery_seconde_side = #{capacitorReactiveEnerySecondeSide}, + absorbs_active_eneryg_one_side = #{absorbsActiveEnerygOneSide}, + release_active_eneryg_one_side = #{releaseActiveEnerygOneSide}, + inductor_reactive_enery_one_side = #{inductorReactiveEneryOneSide}, + capacitor_reactive_enery_one_side = #{capacitorReactiveEneryOneSide}, where id = #{id} diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml index 43c09f8..951fca9 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml @@ -364,7 +364,8 @@ FROM ems_battery_cluster p WHERE p.stack_device_id = #{stackId} AND p.device_id = #{clusterId} - AND DATE(p.update_time) = #{dateTime} + AND p.update_time >= #{dateTime} + AND p.update_time < DATE_ADD(#{dateTime}, INTERVAL 1 DAY) GROUP BY p.site_id, p.device_id, statisDate ) latest INNER JOIN ems_battery_cluster t ON latest.site_id = t.site_id