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

DDS数据同步修改-load

Browse Source
This commit is contained in:
mashili
2025-07-21 11:01:22 +08:00
parent c51c4be498
commit cbcaaaffb6
5 changed files with 189 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java
View File

@ -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();
}
}

75
ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
View File

@ -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");

4
ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
View File

@ -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")));