dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
190 changed files with 18278 additions and 946 deletions
Showing only changes of commit 9da5047148 - Show all commits

View File

@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel;
* 总数据对象 ems_ammeter_data
*
* @author xzzn
* @date 2025-07-03
* @date 2025-07-27
*/
public class EmsAmmeterData extends BaseEntity
{
@ -406,37 +406,17 @@ public class EmsAmmeterData extends BaseEntity
@Excel(name = "正向有功电能 EP+")
private BigDecimal positiveActiveEnergyEpPlus;
/** 吸收有功电度二次侧 */
@Excel(name = "吸收有功电度二次侧")
private BigDecimal absorbsActiveEnerygSecondSide;
/** 电流变比 */
@Excel(name = "电流变比")
private BigDecimal currentPercent;
/** 释放有功电度二次侧 */
@Excel(name = "释放有功电度二次侧")
private BigDecimal releaseActiveEnerygSecondSide;
/** 电压变比 */
@Excel(name = "电压变比")
private BigDecimal voltagePercent;
/** 感性无功电度二次侧 */
@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;
/** 平均电流 */
@Excel(name = "平均电流")
private BigDecimal avgCurrent;
public void setId(Long id)
{
@ -1408,84 +1388,34 @@ public class EmsAmmeterData extends BaseEntity
return positiveActiveEnergyEpPlus;
}
public void setAbsorbsActiveEnerygSecondSide(BigDecimal absorbsActiveEnerygSecondSide)
public void setCurrentPercent(BigDecimal currentPercent)
{
this.absorbsActiveEnerygSecondSide = absorbsActiveEnerygSecondSide;
this.currentPercent = currentPercent;
}
public BigDecimal getAbsorbsActiveEnerygSecondSide()
public BigDecimal getCurrentPercent()
{
return absorbsActiveEnerygSecondSide;
return currentPercent;
}
public void setReleaseActiveEnerygSecondSide(BigDecimal releaseActiveEnerygSecondSide)
public void setVoltagePercent(BigDecimal voltagePercent)
{
this.releaseActiveEnerygSecondSide = releaseActiveEnerygSecondSide;
this.voltagePercent = voltagePercent;
}
public BigDecimal getReleaseActiveEnerygSecondSide()
public BigDecimal getVoltagePercent()
{
return releaseActiveEnerygSecondSide;
return voltagePercent;
}
public void setInductorReactiveEnerySecondeSide(BigDecimal inductorReactiveEnerySecondeSide)
public void setAvgCurrent(BigDecimal avgCurrent)
{
this.inductorReactiveEnerySecondeSide = inductorReactiveEnerySecondeSide;
this.avgCurrent = avgCurrent;
}
public BigDecimal getInductorReactiveEnerySecondeSide()
public BigDecimal getAvgCurrent()
{
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;
return avgCurrent;
}
@Override
@ -1593,14 +1523,9 @@ 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())
.append("currentPercent", getCurrentPercent())
.append("voltagePercent", getVoltagePercent())
.append("avgCurrent", getAvgCurrent())
.toString();
}
}

View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* 电池簇数据对象 ems_battery_cluster
*
* @author xzzn
* @date 2025-06-29
* @date 2025-07-27
*/
public class EmsBatteryCluster extends BaseEntity
{
@ -20,16 +20,16 @@ public class EmsBatteryCluster extends BaseEntity
/** */
private Long id;
/** 工作状态 */
@Excel(name = "工作状态")
/** 工作状态0-正常 1-异常 2-停止 */
@Excel(name = "工作状态0-正常 1-异常 2-停止")
private String workStatus;
/** 与PCS通信状态 */
@Excel(name = "与PCS通信状态")
/** 与PCS通信状态0-正常 1-通信中断 2-异常 */
@Excel(name = "与PCS通信状态0-正常 1-通信中断 2-异常")
private String pcsCommunicationStatus;
/** 与EMS通信状态 */
@Excel(name = "与EMS通信状态")
/** 与EMS通信状态0-正常 1-通信中断 2-异常 */
@Excel(name = "与EMS通信状态0-正常 1-通信中断 2-异常")
private String emsCommunicationStatus;
/** 簇电压 (V) */
@ -212,6 +212,94 @@ public class EmsBatteryCluster extends BaseEntity
@Excel(name = "单次累计放电电量")
private BigDecimal totalDischargeEnergy;
/** 断线检测指示 */
@Excel(name = "断线检测指示")
private String disconnectDetectionIndication;
/** 电压变比 */
@Excel(name = "电压变比")
private BigDecimal voltageTransforRatio;
/** 额定一次电流值 */
@Excel(name = "额定一次电流值")
private BigDecimal ratedPrimaryCurrentValue;
/** 开关量输入输出状态 */
@Excel(name = "开关量输入输出状态")
private String switchInputOutputStatus;
/** 报警状态 */
@Excel(name = "报警状态")
private String alarmStatus;
/** 当前总电压百分比 */
@Excel(name = "当前总电压百分比")
private BigDecimal currentTotalVoltagePercent;
/** 电压直流含量百分比 */
@Excel(name = "电压直流含量百分比")
private BigDecimal voltageContentPercent;
/** 电压交流含量百分比 */
@Excel(name = "电压交流含量百分比")
private BigDecimal voltageAcPercent;
/** 当前总电流百分比 */
@Excel(name = "当前总电流百分比")
private BigDecimal currentTotalCurrentPercent;
/** 电流直流含量百分比 */
@Excel(name = "电流直流含量百分比")
private BigDecimal currentContentPercent;
/** 电流交流含量百分比 */
@Excel(name = "电流交流含量百分比")
private BigDecimal currentAcPercent;
/** 当前总功率百分比 */
@Excel(name = "当前总功率百分比")
private BigDecimal currentTotalPowerPercent;
/** 功率直流含量百分比 */
@Excel(name = "功率直流含量百分比")
private BigDecimal powerContentPercent;
/** 功率交流含量百分比 */
@Excel(name = "功率交流含量百分比")
private BigDecimal powerAcPercent;
/** 日期时间设置(年月) */
@Excel(name = "日期时间设置", readConverterExp = "年=月")
private String dataSettingYearMonth;
/** 日期时间设置(日时) */
@Excel(name = "日期时间设置", readConverterExp = "日=时")
private String dataSettingDayHour;
/** 日期时间设置(分秒) */
@Excel(name = "日期时间设置", readConverterExp = "分=秒")
private String dataSettingMinutesSeconds;
/** 当前抄表日(高)、当前费率(低) */
@Excel(name = "当前抄表日", readConverterExp = "高=")
private BigDecimal currentRate;
/** 软件版本号 */
@Excel(name = "软件版本号")
private String versionNumber;
/** 电压 */
@Excel(name = "电压")
private BigDecimal voltage;
/** 电流 */
@Excel(name = "电流")
private BigDecimal current;
/** 功率 */
@Excel(name = "功率")
private BigDecimal power;
public void setId(Long id)
{
this.id = id;
@ -702,6 +790,226 @@ public class EmsBatteryCluster extends BaseEntity
return totalDischargeEnergy;
}
public void setDisconnectDetectionIndication(String disconnectDetectionIndication)
{
this.disconnectDetectionIndication = disconnectDetectionIndication;
}
public String getDisconnectDetectionIndication()
{
return disconnectDetectionIndication;
}
public void setVoltageTransforRatio(BigDecimal voltageTransforRatio)
{
this.voltageTransforRatio = voltageTransforRatio;
}
public BigDecimal getVoltageTransforRatio()
{
return voltageTransforRatio;
}
public void setRatedPrimaryCurrentValue(BigDecimal ratedPrimaryCurrentValue)
{
this.ratedPrimaryCurrentValue = ratedPrimaryCurrentValue;
}
public BigDecimal getRatedPrimaryCurrentValue()
{
return ratedPrimaryCurrentValue;
}
public void setSwitchInputOutputStatus(String switchInputOutputStatus)
{
this.switchInputOutputStatus = switchInputOutputStatus;
}
public String getSwitchInputOutputStatus()
{
return switchInputOutputStatus;
}
public void setAlarmStatus(String alarmStatus)
{
this.alarmStatus = alarmStatus;
}
public String getAlarmStatus()
{
return alarmStatus;
}
public void setCurrentTotalVoltagePercent(BigDecimal currentTotalVoltagePercent)
{
this.currentTotalVoltagePercent = currentTotalVoltagePercent;
}
public BigDecimal getCurrentTotalVoltagePercent()
{
return currentTotalVoltagePercent;
}
public void setVoltageContentPercent(BigDecimal voltageContentPercent)
{
this.voltageContentPercent = voltageContentPercent;
}
public BigDecimal getVoltageContentPercent()
{
return voltageContentPercent;
}
public void setVoltageAcPercent(BigDecimal voltageAcPercent)
{
this.voltageAcPercent = voltageAcPercent;
}
public BigDecimal getVoltageAcPercent()
{
return voltageAcPercent;
}
public void setCurrentTotalCurrentPercent(BigDecimal currentTotalCurrentPercent)
{
this.currentTotalCurrentPercent = currentTotalCurrentPercent;
}
public BigDecimal getCurrentTotalCurrentPercent()
{
return currentTotalCurrentPercent;
}
public void setCurrentContentPercent(BigDecimal currentContentPercent)
{
this.currentContentPercent = currentContentPercent;
}
public BigDecimal getCurrentContentPercent()
{
return currentContentPercent;
}
public void setCurrentAcPercent(BigDecimal currentAcPercent)
{
this.currentAcPercent = currentAcPercent;
}
public BigDecimal getCurrentAcPercent()
{
return currentAcPercent;
}
public void setCurrentTotalPowerPercent(BigDecimal currentTotalPowerPercent)
{
this.currentTotalPowerPercent = currentTotalPowerPercent;
}
public BigDecimal getCurrentTotalPowerPercent()
{
return currentTotalPowerPercent;
}
public void setPowerContentPercent(BigDecimal powerContentPercent)
{
this.powerContentPercent = powerContentPercent;
}
public BigDecimal getPowerContentPercent()
{
return powerContentPercent;
}
public void setPowerAcPercent(BigDecimal powerAcPercent)
{
this.powerAcPercent = powerAcPercent;
}
public BigDecimal getPowerAcPercent()
{
return powerAcPercent;
}
public void setDataSettingYearMonth(String dataSettingYearMonth)
{
this.dataSettingYearMonth = dataSettingYearMonth;
}
public String getDataSettingYearMonth()
{
return dataSettingYearMonth;
}
public void setDataSettingDayHour(String dataSettingDayHour)
{
this.dataSettingDayHour = dataSettingDayHour;
}
public String getDataSettingDayHour()
{
return dataSettingDayHour;
}
public void setDataSettingMinutesSeconds(String dataSettingMinutesSeconds)
{
this.dataSettingMinutesSeconds = dataSettingMinutesSeconds;
}
public String getDataSettingMinutesSeconds()
{
return dataSettingMinutesSeconds;
}
public void setCurrentRate(BigDecimal currentRate)
{
this.currentRate = currentRate;
}
public BigDecimal getCurrentRate()
{
return currentRate;
}
public void setVersionNumber(String versionNumber)
{
this.versionNumber = versionNumber;
}
public String getVersionNumber()
{
return versionNumber;
}
public void setVoltage(BigDecimal voltage)
{
this.voltage = voltage;
}
public BigDecimal getVoltage()
{
return voltage;
}
public void setCurrent(BigDecimal current)
{
this.current = current;
}
public BigDecimal getCurrent()
{
return current;
}
public void setPower(BigDecimal power)
{
this.power = power;
}
public BigDecimal getPower()
{
return power;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -759,6 +1067,28 @@ public class EmsBatteryCluster extends BaseEntity
.append("minCellSohId", getMinCellSohId())
.append("totalChargeEnergy", getTotalChargeEnergy())
.append("totalDischargeEnergy", getTotalDischargeEnergy())
.append("disconnectDetectionIndication", getDisconnectDetectionIndication())
.append("voltageTransforRatio", getVoltageTransforRatio())
.append("ratedPrimaryCurrentValue", getRatedPrimaryCurrentValue())
.append("switchInputOutputStatus", getSwitchInputOutputStatus())
.append("alarmStatus", getAlarmStatus())
.append("currentTotalVoltagePercent", getCurrentTotalVoltagePercent())
.append("voltageContentPercent", getVoltageContentPercent())
.append("voltageAcPercent", getVoltageAcPercent())
.append("currentTotalCurrentPercent", getCurrentTotalCurrentPercent())
.append("currentContentPercent", getCurrentContentPercent())
.append("currentAcPercent", getCurrentAcPercent())
.append("currentTotalPowerPercent", getCurrentTotalPowerPercent())
.append("powerContentPercent", getPowerContentPercent())
.append("powerAcPercent", getPowerAcPercent())
.append("dataSettingYearMonth", getDataSettingYearMonth())
.append("dataSettingDayHour", getDataSettingDayHour())
.append("dataSettingMinutesSeconds", getDataSettingMinutesSeconds())
.append("currentRate", getCurrentRate())
.append("versionNumber", getVersionNumber())
.append("voltage", getVoltage())
.append("current", getCurrent())
.append("power", getPower())
.toString();
}
}

View File

@ -188,6 +188,62 @@ public class EmsBatteryStack extends BaseEntity
@Excel(name = "设备id")
private String deviceId;
/** 单体个数 */
@Excel(name = "单体个数")
private Long batteryNumber;
/** 单体平均电压 */
@Excel(name = "单体平均电压")
private BigDecimal batteryAvgVoltage;
/** 单体电池压差 */
@Excel(name = "单体电池压差")
private BigDecimal batteryDifferentPressure;
/** 平均温度 */
@Excel(name = "平均温度")
private BigDecimal avgTemperature;
/** 单体电池温度差 */
@Excel(name = "单体电池温度差")
private BigDecimal batteryDifferentTemperature;
/** 最大单体内阻 */
@Excel(name = "最大单体内阻")
private BigDecimal maxInternalResistance;
/** 最小单体内阻 */
@Excel(name = "最小单体内阻")
private BigDecimal minInternalResistance;
/** 平均单体内阻 */
@Excel(name = "平均单体内阻")
private BigDecimal avgInternalResistance;
/** 单体内阻差 */
@Excel(name = "单体内阻差")
private BigDecimal batteryDefferentResistance;
/** 最大单体内阻编号 */
@Excel(name = "最大单体内阻编号")
private Long maxResistanceCellId;
/** 最小单体内阻编号 */
@Excel(name = "最小单体内阻编号")
private Long minResistanceCellId;
/** 环境温度 */
@Excel(name = "环境温度")
private BigDecimal environmentTemperature;
/** 环境湿度 */
@Excel(name = "环境湿度")
private BigDecimal environmentHumidity;
/** 断路器状态 */
@Excel(name = "断路器状态")
private String circuitBreakerStatus;
public void setId(Long id)
{
this.id = id;
@ -618,6 +674,146 @@ public class EmsBatteryStack extends BaseEntity
return deviceId;
}
public void setBatteryNumber(Long batteryNumber)
{
this.batteryNumber = batteryNumber;
}
public Long getBatteryNumber()
{
return batteryNumber;
}
public void setBatteryAvgVoltage(BigDecimal batteryAvgVoltage)
{
this.batteryAvgVoltage = batteryAvgVoltage;
}
public BigDecimal getBatteryAvgVoltage()
{
return batteryAvgVoltage;
}
public void setBatteryDifferentPressure(BigDecimal batteryDifferentPressure)
{
this.batteryDifferentPressure = batteryDifferentPressure;
}
public BigDecimal getBatteryDifferentPressure()
{
return batteryDifferentPressure;
}
public void setAvgTemperature(BigDecimal avgTemperature)
{
this.avgTemperature = avgTemperature;
}
public BigDecimal getAvgTemperature()
{
return avgTemperature;
}
public void setBatteryDifferentTemperature(BigDecimal batteryDifferentTemperature)
{
this.batteryDifferentTemperature = batteryDifferentTemperature;
}
public BigDecimal getBatteryDifferentTemperature()
{
return batteryDifferentTemperature;
}
public void setMaxInternalResistance(BigDecimal maxInternalResistance)
{
this.maxInternalResistance = maxInternalResistance;
}
public BigDecimal getMaxInternalResistance()
{
return maxInternalResistance;
}
public void setMinInternalResistance(BigDecimal minInternalResistance)
{
this.minInternalResistance = minInternalResistance;
}
public BigDecimal getMinInternalResistance()
{
return minInternalResistance;
}
public void setAvgInternalResistance(BigDecimal avgInternalResistance)
{
this.avgInternalResistance = avgInternalResistance;
}
public BigDecimal getAvgInternalResistance()
{
return avgInternalResistance;
}
public void setBatteryDefferentResistance(BigDecimal batteryDefferentResistance)
{
this.batteryDefferentResistance = batteryDefferentResistance;
}
public BigDecimal getBatteryDefferentResistance()
{
return batteryDefferentResistance;
}
public void setMaxResistanceCellId(Long maxResistanceCellId)
{
this.maxResistanceCellId = maxResistanceCellId;
}
public Long getMaxResistanceCellId()
{
return maxResistanceCellId;
}
public void setMinResistanceCellId(Long minResistanceCellId)
{
this.minResistanceCellId = minResistanceCellId;
}
public Long getMinResistanceCellId()
{
return minResistanceCellId;
}
public void setEnvironmentTemperature(BigDecimal environmentTemperature)
{
this.environmentTemperature = environmentTemperature;
}
public BigDecimal getEnvironmentTemperature()
{
return environmentTemperature;
}
public void setEnvironmentHumidity(BigDecimal environmentHumidity)
{
this.environmentHumidity = environmentHumidity;
}
public BigDecimal getEnvironmentHumidity()
{
return environmentHumidity;
}
public void setCircuitBreakerStatus(String circuitBreakerStatus)
{
this.circuitBreakerStatus = circuitBreakerStatus;
}
public String getCircuitBreakerStatus()
{
return circuitBreakerStatus;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -668,6 +864,20 @@ public class EmsBatteryStack extends BaseEntity
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("batteryNumber", getBatteryNumber())
.append("batteryAvgVoltage", getBatteryAvgVoltage())
.append("batteryDifferentPressure", getBatteryDifferentPressure())
.append("avgTemperature", getAvgTemperature())
.append("batteryDifferentTemperature", getBatteryDifferentTemperature())
.append("maxInternalResistance", getMaxInternalResistance())
.append("minInternalResistance", getMinInternalResistance())
.append("avgInternalResistance", getAvgInternalResistance())
.append("batteryDefferentResistance", getBatteryDefferentResistance())
.append("maxResistanceCellId", getMaxResistanceCellId())
.append("minResistanceCellId", getMinResistanceCellId())
.append("environmentTemperature", getEnvironmentTemperature())
.append("environmentHumidity", getEnvironmentHumidity())
.append("circuitBreakerStatus", getCircuitBreakerStatus())
.toString();
}
}

View File

@ -202,6 +202,10 @@ public class EmsPcsData extends BaseEntity
@Excel(name = "系统输出W相电流")
private BigDecimal sysWCurrent;
/** 电网频率 */
@Excel(name = "电网频率")
private BigDecimal dwFrequency;
public void setId(Long id)
{
this.id = id;
@ -662,6 +666,16 @@ public class EmsPcsData extends BaseEntity
return sysWCurrent;
}
public void setDwFrequency(BigDecimal dwFrequency)
{
this.dwFrequency = dwFrequency;
}
public BigDecimal getDwFrequency()
{
return dwFrequency;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -716,6 +730,7 @@ public class EmsPcsData extends BaseEntity
.append("sysUCurrent", getSysUCurrent())
.append("sysVCurrent", getSysVCurrent())
.append("sysWCurrent", getSysWCurrent())
.append("dwFrequency", getDwFrequency())
.toString();
}
}

View File

@ -62,7 +62,6 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
batteryStackDataProcess(deviceId, jsonData);
} else if (deviceId.contains("BMSC")) {
log.info("BMSC data:" + jsonData);
batteryClusterDataProcess(deviceId, jsonData);
batteryDataProcess(deviceId, jsonData);
@ -71,7 +70,11 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
pcsBranchDataProcess(deviceId, jsonData);
} else if (deviceId.contains("LOAD")) {
loadDataProcess(deviceId, jsonData);
} else if (deviceId.contains("METEGF")) {
log.info("METEGF DATA PROCESS");
meteGFDataProcess(deviceId, jsonData);
} else if (deviceId.contains("METE")) {
log.info("OTHER METE DATA PROCESS");
meteDataProcess(deviceId, jsonData);
}
}
@ -90,59 +93,33 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
dataStack.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
dataStack.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
// 电池堆状态数据设置
dataStack.setOperationStatus(StringUtils.getString(obj.get("DCZT")));
dataStack.setStackVoltage(StringUtils.getBigDecimal(obj.get("DCDDY")));
dataStack.setStackCurrent(StringUtils.getBigDecimal(obj.get("DCDDL")));
dataStack.setStackSoc(StringUtils.getBigDecimal(obj.get("DCDSOC")));
dataStack.setStackSoh(StringUtils.getBigDecimal(obj.get("DCDSOH")));
// 电压极值信息
dataStack.setMaxCellVoltage(StringUtils.getBigDecimal(obj.get("ZGDCDY")));
dataStack.setMaxVoltageGroupId(StringUtils.getLong(obj.get("ZGDCDYZH")));
dataStack.setMaxVoltageCellId(StringUtils.getLong(obj.get("ZGDCDYZHDH")));
dataStack.setMinCellVoltage(StringUtils.getBigDecimal(obj.get("ZDDCDY")));
dataStack.setMinVoltageGroupId(StringUtils.getLong(obj.get("ZDDCDYZH")));
dataStack.setMinVoltageCellId(StringUtils.getLong(obj.get("ZDDCDYZHDH")));
dataStack.setMaxCellVoltage(StringUtils.getBigDecimal(obj.get("DTZDDY")));
dataStack.setMaxVoltageGroupId(StringUtils.getLong(obj.get("DTZDDYXH")));
dataStack.setMinCellVoltage(StringUtils.getBigDecimal(obj.get("DTZXDY")));
dataStack.setMinVoltageGroupId(StringUtils.getLong(obj.get("DTZXDYXH")));
// 温度极值信息
dataStack.setMaxCellTemp(StringUtils.getBigDecimal(obj.get("ZGDCWD")));
dataStack.setMaxTempGroupId(StringUtils.getLong(obj.get("ZGDCWDZH")));
dataStack.setMaxTempCellId(StringUtils.getLong(obj.get("ZGDCWDZHDH")));
dataStack.setMinCellTemp(StringUtils.getBigDecimal(obj.get("ZDDCWD")));
dataStack.setMinTempGroupId(StringUtils.getLong(obj.get("ZDDCWDZH")));
dataStack.setMinTempCellId(StringUtils.getLong(obj.get("ZDDCWDZHDH")));
// 电量统计信息
dataStack.setTotalChargeCapacity(StringUtils.getBigDecimal(obj.get("DLJCDDL")));
dataStack.setTotalDischargeCapacity(StringUtils.getBigDecimal(obj.get("DLCFDDL")));
dataStack.setSessionChargeCapacity(StringUtils.getBigDecimal(obj.get("DDCLJCDDL")));
dataStack.setSessionDischargeCapacity(StringUtils.getBigDecimal(obj.get("DDCLJFDDL")));
dataStack.setAvailableChargeCapacity(StringUtils.getBigDecimal(obj.get("DKCDL")));
dataStack.setAvailableDischargeCapacity(StringUtils.getBigDecimal(obj.get("DKFDL")));
// 时间信息
dataStack.setRemainingDischargeTime(StringUtils.getLong(obj.get("KYFDSJ")));
dataStack.setRemainingChargeTime(StringUtils.getLong(obj.get("KYCDSJ")));
// 功率/电流限制
dataStack.setMaxDischargePower(StringUtils.getBigDecimal(obj.get("YXZDFDGL")));
dataStack.setMaxChargePower(StringUtils.getBigDecimal(obj.get("YXZDCDGL")));
dataStack.setMaxDischargeCurrent(StringUtils.getBigDecimal(obj.get("YXZDFDDL")));
dataStack.setMaxChargeCurrent(StringUtils.getBigDecimal(obj.get("YXZDCDDL")));
// 当日统计
dataStack.setDailyDischargeCycles(StringUtils.getLong(obj.get("DTFDCS")));
dataStack.setDailyChargeCycles(StringUtils.getLong(obj.get("DTCDCS")));
dataStack.setDailyDischargeCapacity(StringUtils.getBigDecimal(obj.get("DTFDDL")));
dataStack.setDailyChargeCapacity(StringUtils.getBigDecimal(obj.get("DTCDDL")));
// 系统状态
dataStack.setOperatingTemp(StringUtils.getBigDecimal(obj.get("YXWD")));
dataStack.setBmsStatus(StringUtils.getString(obj.get("BMSDDQZT")));
dataStack.setBmsChargeStatus(StringUtils.getString(obj.get("BMSCFDZT")));
dataStack.setStackInsulationResistance(StringUtils.getBigDecimal(obj.get("DCDJYDZ")));
dataStack.setMaxCellTemp(StringUtils.getBigDecimal(obj.get("DTZGWD")));
dataStack.setMaxTempGroupId(StringUtils.getLong(obj.get("DTZGWDXH")));
dataStack.setMinCellTemp(StringUtils.getBigDecimal(obj.get("DTZDWD")));
dataStack.setMinTempGroupId(StringUtils.getLong(obj.get("DTZDWDXH")));
// 干节点信号状态
dataStack.setBatteryNumber(StringUtils.getLong(obj.get("DTGS")));
dataStack.setBatteryAvgVoltage(StringUtils.getBigDecimal(obj.get("DTPJDY")));
dataStack.setBatteryDifferentPressure(StringUtils.getBigDecimal(obj.get("DTDCYC")));
dataStack.setAvgTemperature(StringUtils.getBigDecimal(obj.get("DTPJWD")));
dataStack.setBatteryDifferentTemperature(StringUtils.getBigDecimal(obj.get("DTDCWC")));
dataStack.setMaxInternalResistance(StringUtils.getBigDecimal(obj.get("DTZDNZ")));
dataStack.setMinInternalResistance(StringUtils.getBigDecimal(obj.get("DTZXNZ")));
dataStack.setAvgInternalResistance(StringUtils.getBigDecimal(obj.get("DTPJNZ")));
dataStack.setBatteryDefferentResistance(StringUtils.getBigDecimal(obj.get("DTDCNZC")));
dataStack.setMaxResistanceCellId(StringUtils.getLong(obj.get("DTZDNZXH")));
dataStack.setMinResistanceCellId(StringUtils.getLong(obj.get("DTZXNZXH")));
dataStack.setEnvironmentTemperature(StringUtils.getBigDecimal(obj.get("HJWD")));
dataStack.setEnvironmentHumidity(StringUtils.getBigDecimal(obj.get("HJSD")));
dataStack.setCircuitBreakerStatus(StringUtils.getString(obj.get("LDQZT")));
dataStack.setCreateBy("system");
dataStack.setCreateTime(DateUtils.getNowDate());
@ -173,43 +150,39 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
}
//BMS 电池簇
EmsBatteryCluster data = new EmsBatteryCluster();
// 设置所有 BigDecimal 类型字段为 ZERO
data.setChargeableCapacity(StringUtils.getBigDecimal(obj.get("KCDL")));
data.setClusterVoltage(StringUtils.getBigDecimal(obj.get("ZDY")));
data.setClusterCurrent(StringUtils.getBigDecimal(obj.get("ZDL")));
data.setTotalChargedCapacity(StringUtils.getBigDecimal(obj.get("LJCDDL")));
data.setDischargeableCapacity(StringUtils.getBigDecimal(obj.get("KFDL")));
data.setTotalDischargedCapacity(StringUtils.getBigDecimal(obj.get("LJFDDL")));
data.setSoh(StringUtils.getBigDecimal(obj.get("ZSOH")));
data.setAverageTemperature(StringUtils.getBigDecimal(obj.get("MKWD")));
data.setInsulationResistance(StringUtils.getBigDecimal(obj.get("ZJYDZ")));
data.setCurrentSoc(StringUtils.getBigDecimal(obj.get("ZSOC")));
data.setMaxAllowedChargePower(StringUtils.getBigDecimal(obj.get("YXCDZDGL")));
data.setMaxAllowedDischargePower(StringUtils.getBigDecimal(obj.get("YXFDZDGL")));
data.setMaxAllowedChargeVoltage(StringUtils.getBigDecimal(obj.get("YXCDZDDY")));
data.setMaxAllowedDischargeVoltage(StringUtils.getBigDecimal(obj.get("YXFDZDDY")));
data.setMaxAllowedChargeCurrent(StringUtils.getBigDecimal(obj.get("YXCDZDDL")));
data.setMaxAllowedDischargeCurrent(StringUtils.getBigDecimal(obj.get("YXFDZDDL")));
data.setBatteryPackVoltage(StringUtils.getBigDecimal(obj.get("ZDY")));
data.setBatteryPackCurrent(StringUtils.getBigDecimal(obj.get("ZDL")));
data.setBatteryPackTemp(StringUtils.getBigDecimal(obj.get("MKWD")));
data.setBatteryPackSoc(StringUtils.getBigDecimal(obj.get("ZSOC")));
data.setBatteryPackSoh(StringUtils.getBigDecimal(obj.get("ZSOH")));
data.setBatteryPackInsulationResistance(StringUtils.getBigDecimal(obj.get("ZJYDZ")));
data.setAvgCellVoltage(StringUtils.getBigDecimal(obj.get("PJDTDY")));
data.setAvgCellTemp(StringUtils.getBigDecimal(obj.get("PJDTWD")));
data.setMaxCellVoltage(StringUtils.getBigDecimal(obj.get("ZGDTDY")));
data.setMinCellVoltage(StringUtils.getBigDecimal(obj.get("ZDDTDY")));
data.setMaxCellTemp(StringUtils.getBigDecimal(obj.get("ZGDTWD")));
data.setMinCellTemp(StringUtils.getBigDecimal(obj.get("ZDDTWD")));
data.setMaxCellSoc(StringUtils.getBigDecimal(obj.get("ZGDTSOC")));
data.setMinCellSoc(StringUtils.getBigDecimal(obj.get("ZDDTSOC")));
data.setMaxCellSoh(StringUtils.getBigDecimal(obj.get("ZGDTSOH")));
data.setMinCellSoh(StringUtils.getBigDecimal(obj.get("ZDDTSOH")));
data.setTotalChargeEnergy(StringUtils.getBigDecimal(obj.get("DCLJCDDL")));
data.setTotalDischargeEnergy(StringUtils.getBigDecimal(obj.get("DCLJFDDL")));
// 电流电压功率
data.setClusterVoltage(StringUtils.getBigDecimal(obj.get("ZLDYZ")));
data.setClusterCurrent(StringUtils.getBigDecimal(obj.get("ZLDLZ")));
data.setMaxAllowedChargePower(StringUtils.getBigDecimal(obj.get("GLZ")));
data.setTotalChargeEnergy(StringUtils.getBigDecimal(obj.get("ZZXYGDN1")));
data.setTotalDischargeEnergy(StringUtils.getBigDecimal(obj.get("ZFXYGDN1")));
// 特殊字段
data.setDisconnectDetectionIndication(StringUtils.getString(obj.get("DXJCZS")));
data.setVoltageTransforRatio(StringUtils.getBigDecimal(obj.get("DYBB")));
data.setRatedPrimaryCurrentValue(StringUtils.getBigDecimal(obj.get("EDYCDLZ")));
data.setSwitchInputOutputStatus(StringUtils.getString(obj.get("KGLSRSCZT")));
data.setAlarmStatus(StringUtils.getString(obj.get("BJZT")));
data.setCurrentTotalVoltagePercent(StringUtils.getBigDecimal(obj.get("DQZDYBFB")));
data.setVoltageContentPercent(StringUtils.getBigDecimal(obj.get("DYZLHLBFB")));
data.setVoltageAcPercent(StringUtils.getBigDecimal(obj.get("DYJLHLBFB")));
data.setCurrentTotalCurrentPercent(StringUtils.getBigDecimal(obj.get("DQZDLBFB")));
data.setCurrentContentPercent(StringUtils.getBigDecimal(obj.get("DLZLHLBFB")));
data.setCurrentAcPercent(StringUtils.getBigDecimal(obj.get("DLJLHLBFB")));
data.setCurrentTotalPowerPercent(StringUtils.getBigDecimal(obj.get("DQZGLBFB")));
data.setPowerContentPercent(StringUtils.getBigDecimal(obj.get("GLZLHLBFB")));
data.setPowerAcPercent(StringUtils.getBigDecimal(obj.get("GLJLHLBFB")));
data.setDataSettingYearMonth(StringUtils.getString(obj.get("RQSJSZNY")));
data.setDataSettingDayHour(StringUtils.getString(obj.get("RQSJSZRS")));
data.setDataSettingMinutesSeconds(StringUtils.getString(obj.get("RQSJSZFM")));
data.setCurrentRate(StringUtils.getBigDecimal(obj.get("DQCBRFL")));
data.setVersionNumber(StringUtils.getString(obj.get("RJBBH")));
data.setVoltage(StringUtils.getBigDecimal(obj.get("DY")));
data.setCurrent(StringUtils.getBigDecimal(obj.get("DL")));
data.setPower(StringUtils.getBigDecimal(obj.get("GL")));
// 其他非 BigDecimal 字段
data.setBatteryPackTemp(StringUtils.getBigDecimal(obj.get("NBWD")));
data.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
data.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
data.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
@ -219,14 +192,6 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
data.setUpdateTime(DateUtils.getNowDate());
data.setSiteId(SITE_ID);
data.setDeviceId(deviceId);
data.setMaxCellVoltageId(StringUtils.getLong(obj.get("ZGDTDYDYD")));
data.setMinCellVoltageId(StringUtils.getLong(obj.get("ZDDTDYDYD")));
data.setMaxCellTempId(StringUtils.getLong(obj.get("ZGDTWDDYD")));
data.setMinCellTempId(StringUtils.getLong(obj.get("ZDDTWDDYD")));
data.setMaxCellSocId(StringUtils.getLong(obj.get("ZGDTSOCDYD")));
data.setMinCellSocId(StringUtils.getLong(obj.get("ZDDTSOCDYD")));
data.setMaxCellSohId(StringUtils.getLong(obj.get("ZGDTSOHDYD")));
data.setMinCellSohId(StringUtils.getLong(obj.get("ZDDTSOHDYD")));
if (StringUtils.isNotBlank(stackDeviceId)) {
data.setStackDeviceId(stackDeviceId);
} else {
@ -309,30 +274,22 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
pcsData.setDeviceStatus(DeviceStatus.ONLINE.getCode());
pcsData.setControlMode(ControlModeStatus.REMOTE.getCode());
// 电流
pcsData.setaPhaseCurrent(StringUtils.getBigDecimal(obj.get("PCSJLDLIA")));
pcsData.setbPhaseCurrent(StringUtils.getBigDecimal(obj.get("PCSJLDLIB")));
pcsData.setcPhaseCurrent(StringUtils.getBigDecimal(obj.get("PCSJLDLIC")));
// 功率与能量类字段
pcsData.setDcPower(StringUtils.getBigDecimal(obj.get("ZLZGL")));
pcsData.setDcVoltage(StringUtils.getBigDecimal(obj.get("ZLDY")));
pcsData.setDcCurrent(StringUtils.getBigDecimal(obj.get("ZLDL")));
pcsData.setTotalActivePower(StringUtils.getBigDecimal(obj.get("JLYGGL")));
pcsData.setDailyAcChargeEnergy(StringUtils.getBigDecimal(obj.get("RCDL")));
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")));
pcsData.setDcPower(StringUtils.getBigDecimal(obj.get("XTSZGL")));
pcsData.setTotalAcChargeEnergy(StringUtils.getBigDecimal(obj.get("ZCDL")));
pcsData.setTotalAcDischargeEnergy(StringUtils.getBigDecimal(obj.get("ZFDL")));
pcsData.setAcChargeActivePower(StringUtils.getBigDecimal(obj.get("JLCCDYGGL")));
pcsData.setAcCapacitiveReactivePower(StringUtils.getBigDecimal(obj.get("JLCRXWGGL")));
pcsData.setAcDischargeActivePower(StringUtils.getBigDecimal(obj.get("JLCFDYGGL")));
pcsData.setAcInductiveReactivePower(StringUtils.getBigDecimal(obj.get("JLCGXWGGL")));
pcsData.setMaxCapacitivePowerCapacity(StringUtils.getBigDecimal(obj.get("ZDRXWGNL")));
pcsData.setMaxInductivePowerCapacity(StringUtils.getBigDecimal(obj.get("ZDGXWGNL")));
pcsData.setMaxChargePowerCapacity(StringUtils.getBigDecimal(obj.get("ZDKCGL")));
pcsData.setMaxDischargePowerCapacity(StringUtils.getBigDecimal(obj.get("ZDKFGL")));
pcsData.setTotalAcChargeEnergy(StringUtils.getBigDecimal(obj.get("CDDN")));
pcsData.setTotalAcDischargeEnergy(StringUtils.getBigDecimal(obj.get("FDDN")));
// 温度与环境参数
// pcsData.setPcsModuleTemperature(StringUtils.getBigDecimal(obj.get("ChargeableCapacity")));
// pcsData.setPcsEnvironmentTemperature(StringUtils.getBigDecimal(obj.get("ChargeableCapacity")));
// pcsData.setAcFrequency(StringUtils.getBigDecimal(obj.get("ChargeableCapacity")));
// 电网频率
pcsData.setDwFrequency(StringUtils.getBigDecimal(obj.get("DWPL")));
// 状态指示类
pcsData.setBranchStatus(BranchStatus.NORMAL.getCode());
@ -349,10 +306,6 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
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")));
// 系统管理字段
pcsData.setCreateBy("system");
pcsData.setCreateTime(DateUtils.getNowDate());
@ -381,28 +334,17 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
EmsPcsBranchData data = new EmsPcsBranchData();
data.setDeviceId(deviceId);
data.setGridStatus(GridStatus.GRID.getCode());
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.setGridWVoltage(StringUtils.getBigDecimal(fields.get("DWWXDY")));
data.setOutputUCurrent(StringUtils.getBigDecimal(fields.get("SCUXDL")));
data.setOutputVCurrent(StringUtils.getBigDecimal(fields.get("SCVXDL")));
data.setOutputWCurrent(StringUtils.getBigDecimal(fields.get("SCWXDL")));
data.setApparentPower(StringUtils.getBigDecimal(fields.get("SZGL")));
data.setActivePower(StringUtils.getBigDecimal(fields.get("YGGL")));
data.setReactivePower(StringUtils.getBigDecimal(fields.get("WGGL")));
data.setPowerFactor(StringUtils.getBigDecimal(fields.get("GLYS")));
data.setFrequency(StringUtils.getBigDecimal(fields.get("PL")));
data.setInternalTemp(StringUtils.getBigDecimal(fields.get("DY1WD")));
data.setuIgbtTemp(StringUtils.getBigDecimal(fields.get("UXIGBTWD")));
data.setvIgbtTemp(StringUtils.getBigDecimal(fields.get("VXIGBTWD")));
data.setwIgbtTemp(StringUtils.getBigDecimal(fields.get("WXIGBTWD")));
data.setAvailablePower(StringUtils.getBigDecimal(fields.get("KYGL")));
data.setTotalLoadRatio(StringUtils.getBigDecimal(fields.get("ZFZB")));
data.setAcLeakageCurrent(StringUtils.getBigDecimal(fields.get("JLLDL")));
data.setInsulationResistance(StringUtils.getBigDecimal(fields.get("JYZK")));
data.setDcPower(StringUtils.getBigDecimal(fields.get("BMSC01ZLSCGL")));
data.setDcVoltage(StringUtils.getBigDecimal(fields.get("BMSC01ZLDY")));
data.setDcCurrent(StringUtils.getBigDecimal(fields.get("BMSC01ZLDL")));
data.setGridUVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUAB")));
data.setGridVVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUBC")));
data.setGridWVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUCA")));
data.setOutputUCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIA")));
data.setOutputVCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIB")));
data.setOutputWCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIC")));
data.setBranchId(recordId);
list.add(data);
}
@ -415,6 +357,70 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
}
private void meteGFDataProcess(String deviceId, String dataJson) {
//总表
Map<String, Object> obj = JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {
});
EmsAmmeterData dataGF = new EmsAmmeterData();
// 更新时间
dataGF.setDataUpdateTime(new Date());
// 电压+电流 - dds字段
dataGF.setPhaseAVoltage(StringUtils.getBigDecimal(obj.get("AXDY")));
dataGF.setPhaseBVoltage(StringUtils.getBigDecimal(obj.get("BXDY")));
dataGF.setPhaseCVoltage(StringUtils.getBigDecimal(obj.get("CXDY")));
dataGF.setPhaseACurrent(StringUtils.getBigDecimal(obj.get("AXDL")));
dataGF.setPhaseBCurrent(StringUtils.getBigDecimal(obj.get("BXDL")));
dataGF.setPhaseCCurrent(StringUtils.getBigDecimal(obj.get("CXDL")));
dataGF.setAbLineVoltage(StringUtils.getBigDecimal(obj.get("ABXDY")));
dataGF.setCbLineVoltage(StringUtils.getBigDecimal(obj.get("BCXDY")));
dataGF.setAcLineVoltage(StringUtils.getBigDecimal(obj.get("CAXDY")));
// 频率
dataGF.setFrequency(StringUtils.getBigDecimal(obj.get("PL")));
// 功率 有功+总+无功+无总+视在
dataGF.setPhaseAActivePower(StringUtils.getBigDecimal(obj.get("AXYGGL")));
dataGF.setPhaseBActivePower(StringUtils.getBigDecimal(obj.get("BXYGGL")));
dataGF.setPhaseCActivePower(StringUtils.getBigDecimal(obj.get("CXYGGL")));
dataGF.setTotalActivePower(StringUtils.getBigDecimal(obj.get("ZYGGL")));
dataGF.setPhaseAReactivePower(StringUtils.getBigDecimal(obj.get("AXWGGL")));
dataGF.setPhaseBReactivePower(StringUtils.getBigDecimal(obj.get("BXWGGL")));
dataGF.setPhaseCReactivePower(StringUtils.getBigDecimal(obj.get("CXWGGL")));
dataGF.setTotalReactivePower(StringUtils.getBigDecimal(obj.get("ZWGGL")));
dataGF.setPhaseAApparentPower(StringUtils.getBigDecimal(obj.get("AXSZGL")));
dataGF.setPhaseBApparentPower(StringUtils.getBigDecimal(obj.get("BXSZGL")));
dataGF.setPhaseCApparentPower(StringUtils.getBigDecimal(obj.get("CXSZGL")));
dataGF.setTotalApparentPower(StringUtils.getBigDecimal(obj.get("ZSZGL")));
// 功率因数
dataGF.setPhaseAPowerFactor(StringUtils.getBigDecimal(obj.get("AXGLYS")));
dataGF.setPhaseBPowerFactor(StringUtils.getBigDecimal(obj.get("BXGLYS")));
dataGF.setPhaseCPowerFactor(StringUtils.getBigDecimal(obj.get("CXGLYS")));
dataGF.setTotalPowerFactor(StringUtils.getBigDecimal(obj.get("ZGLYS")));
// 其他字段
dataGF.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("WGDN")));
dataGF.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("WGDN")));
dataGF.setCurrentPercent(StringUtils.getBigDecimal(obj.get("DLBB")));
dataGF.setVoltagePercent(StringUtils.getBigDecimal(obj.get("DYBB")));
dataGF.setAvgCurrent(StringUtils.getBigDecimal(obj.get("PJDL")));
dataGF.setCreateBy("system");
dataGF.setCreateTime(DateUtils.getNowDate());
dataGF.setUpdateBy("system");
dataGF.setUpdateTime(DateUtils.getNowDate());
dataGF.setSiteId(SITE_ID);
dataGF.setDeviceId(deviceId);
emsAmmeterDataMapper.insertEmsAmmeterData(dataGF);
redisCache.setCacheObject(RedisKeyConstants.AMMETER + SITE_ID + "_" +deviceId, dataGF);
}
private void loadDataProcess(String deviceId, String dataJson) {
//总表
@ -460,20 +466,15 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService {
dataLoad.setPhaseCPowerFactor(StringUtils.getBigDecimal(obj.get("CXGLYS")));
dataLoad.setTotalPowerFactor(StringUtils.getBigDecimal(obj.get("ZGLYS")));
// 需量
dataLoad.setForwardAcMaxDemand(StringUtils.getBigDecimal(obj.get("ZXYGZDXL")));
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.setSecondaryReverseReactiveEnergy(StringUtils.getBigDecimal(obj.get("GXWGDDECC")));
dataLoad.setSecondaryNegativeActiveEnergy(StringUtils.getBigDecimal(obj.get("SFTGDDECC")));
dataLoad.setSecondaryPositiveReactiveEnergy(StringUtils.getBigDecimal(obj.get("RXWGDDECC")));
dataLoad.setSecondaryPositiveActiveEnergy(StringUtils.getBigDecimal(obj.get("XSYGDDECC")));
dataLoad.setReverseReactiveEnergyEqMinus(StringUtils.getBigDecimal(obj.get("RXWGDDYCC")));
dataLoad.setReverseActiveEnergyEpMinus(StringUtils.getBigDecimal(obj.get("SFYGDDYCC")));
dataLoad.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("GXWGDDYCC")));
dataLoad.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("XSYGDDYCC")));
dataLoad.setCreateBy("system");
dataLoad.setCreateTime(DateUtils.getNowDate());

View File

@ -107,18 +107,13 @@
<result property="reverseActiveEnergyEpMinus" column="reverse_active_energy_ep_minus" />
<result property="positiveReactiveEnergyEqPlus" column="positive_reactive_energy_eq_plus" />
<result property="positiveActiveEnergyEpPlus" column="positive_active_energy_ep_plus" />
<result property="absorbsActiveEnerygSecondSide" column="absorbs_active_eneryg_second_side" />
<result property="releaseActiveEnerygSecondSide" column="release_active_eneryg_second_side" />
<result property="inductorReactiveEnerySecondeSide" column="inductor_reactive_enery_seconde_side" />
<result property="capacitorReactiveEnerySecondeSide" column="capacitor_reactive_enery_seconde_side" />
<result property="absorbsActiveEnerygOneSide" column="absorbs_active_eneryg_one_side" />
<result property="releaseActiveEnerygOneSide" column="release_active_eneryg_one_side" />
<result property="inductorReactiveEneryOneSide" column="inductor_reactive_enery_one_side" />
<result property="capacitorReactiveEneryOneSide" column="capacitor_reactive_enery_one_side" />
<result property="currentPercent" column="current_percent" />
<result property="voltagePercent" column="voltage_percent" />
<result property="avgCurrent" column="avg_current" />
</resultMap>
<sql id="selectEmsAmmeterDataVo">
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
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, current_percent, voltage_percent, avg_current from ems_ammeter_data
</sql>
<select id="selectEmsAmmeterDataList" parameterType="EmsAmmeterData" resultMap="EmsAmmeterDataResult">
@ -220,14 +215,9 @@
<if test="reverseActiveEnergyEpMinus != null "> and reverse_active_energy_ep_minus = #{reverseActiveEnergyEpMinus}</if>
<if test="positiveReactiveEnergyEqPlus != null "> and positive_reactive_energy_eq_plus = #{positiveReactiveEnergyEqPlus}</if>
<if test="positiveActiveEnergyEpPlus != null "> and positive_active_energy_ep_plus = #{positiveActiveEnergyEpPlus}</if>
<if test="absorbsActiveEnerygSecondSide != null "> and absorbs_active_eneryg_second_side = #{absorbsActiveEnerygSecondSide}</if>
<if test="releaseActiveEnerygSecondSide != null "> and release_active_eneryg_second_side = #{releaseActiveEnerygSecondSide}</if>
<if test="inductorReactiveEnerySecondeSide != null "> and inductor_reactive_enery_seconde_side = #{inductorReactiveEnerySecondeSide}</if>
<if test="capacitorReactiveEnerySecondeSide != null "> and capacitor_reactive_enery_seconde_side = #{capacitorReactiveEnerySecondeSide}</if>
<if test="absorbsActiveEnerygOneSide != null "> and absorbs_active_eneryg_one_side = #{absorbsActiveEnerygOneSide}</if>
<if test="releaseActiveEnerygOneSide != null "> and release_active_eneryg_one_side = #{releaseActiveEnerygOneSide}</if>
<if test="inductorReactiveEneryOneSide != null "> and inductor_reactive_enery_one_side = #{inductorReactiveEneryOneSide}</if>
<if test="capacitorReactiveEneryOneSide != null "> and capacitor_reactive_enery_one_side = #{capacitorReactiveEneryOneSide}</if>
<if test="currentPercent != null "> and current_percent = #{currentPercent}</if>
<if test="voltagePercent != null "> and voltage_percent = #{voltagePercent}</if>
<if test="avgCurrent != null "> and avg_current = #{avgCurrent}</if>
</where>
</select>
@ -340,14 +330,9 @@
<if test="reverseActiveEnergyEpMinus != null">reverse_active_energy_ep_minus,</if>
<if test="positiveReactiveEnergyEqPlus != null">positive_reactive_energy_eq_plus,</if>
<if test="positiveActiveEnergyEpPlus != null">positive_active_energy_ep_plus,</if>
<if test="absorbsActiveEnerygSecondSide != null">absorbs_active_eneryg_second_side,</if>
<if test="releaseActiveEnerygSecondSide != null">release_active_eneryg_second_side,</if>
<if test="inductorReactiveEnerySecondeSide != null">inductor_reactive_enery_seconde_side,</if>
<if test="capacitorReactiveEnerySecondeSide != null">capacitor_reactive_enery_seconde_side,</if>
<if test="absorbsActiveEnerygOneSide != null">absorbs_active_eneryg_one_side,</if>
<if test="releaseActiveEnerygOneSide != null">release_active_eneryg_one_side,</if>
<if test="inductorReactiveEneryOneSide != null">inductor_reactive_enery_one_side,</if>
<if test="capacitorReactiveEneryOneSide != null">capacitor_reactive_enery_one_side,</if>
<if test="currentPercent != null">current_percent,</if>
<if test="voltagePercent != null">voltage_percent,</if>
<if test="avgCurrent != null">avg_current,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dataUpdateTime != null">#{dataUpdateTime},</if>
@ -451,14 +436,9 @@
<if test="reverseActiveEnergyEpMinus != null">#{reverseActiveEnergyEpMinus},</if>
<if test="positiveReactiveEnergyEqPlus != null">#{positiveReactiveEnergyEqPlus},</if>
<if test="positiveActiveEnergyEpPlus != null">#{positiveActiveEnergyEpPlus},</if>
<if test="absorbsActiveEnerygSecondSide != null">#{absorbsActiveEnerygSecondSide},</if>
<if test="releaseActiveEnerygSecondSide != null">#{releaseActiveEnerygSecondSide},</if>
<if test="inductorReactiveEnerySecondeSide != null">#{inductorReactiveEnerySecondeSide},</if>
<if test="capacitorReactiveEnerySecondeSide != null">#{capacitorReactiveEnerySecondeSide},</if>
<if test="absorbsActiveEnerygOneSide != null">#{absorbsActiveEnerygOneSide},</if>
<if test="releaseActiveEnerygOneSide != null">#{releaseActiveEnerygOneSide},</if>
<if test="inductorReactiveEneryOneSide != null">#{inductorReactiveEneryOneSide},</if>
<if test="capacitorReactiveEneryOneSide != null">#{capacitorReactiveEneryOneSide},</if>
<if test="currentPercent != null">#{currentPercent},</if>
<if test="voltagePercent != null">#{voltagePercent},</if>
<if test="avgCurrent != null">#{avgCurrent},</if>
</trim>
</insert>
@ -566,14 +546,9 @@
<if test="reverseActiveEnergyEpMinus != null">reverse_active_energy_ep_minus = #{reverseActiveEnergyEpMinus},</if>
<if test="positiveReactiveEnergyEqPlus != null">positive_reactive_energy_eq_plus = #{positiveReactiveEnergyEqPlus},</if>
<if test="positiveActiveEnergyEpPlus != null">positive_active_energy_ep_plus = #{positiveActiveEnergyEpPlus},</if>
<if test="absorbsActiveEnerygSecondSide != null">absorbs_active_eneryg_second_side = #{absorbsActiveEnerygSecondSide},</if>
<if test="releaseActiveEnerygSecondSide != null">release_active_eneryg_second_side = #{releaseActiveEnerygSecondSide},</if>
<if test="inductorReactiveEnerySecondeSide != null">inductor_reactive_enery_seconde_side = #{inductorReactiveEnerySecondeSide},</if>
<if test="capacitorReactiveEnerySecondeSide != null">capacitor_reactive_enery_seconde_side = #{capacitorReactiveEnerySecondeSide},</if>
<if test="absorbsActiveEnerygOneSide != null">absorbs_active_eneryg_one_side = #{absorbsActiveEnerygOneSide},</if>
<if test="releaseActiveEnerygOneSide != null">release_active_eneryg_one_side = #{releaseActiveEnerygOneSide},</if>
<if test="inductorReactiveEneryOneSide != null">inductor_reactive_enery_one_side = #{inductorReactiveEneryOneSide},</if>
<if test="capacitorReactiveEneryOneSide != null">capacitor_reactive_enery_one_side = #{capacitorReactiveEneryOneSide},</if>
<if test="currentPercent != null">current_percent = #{currentPercent},</if>
<if test="voltagePercent != null">voltage_percent = #{voltagePercent},</if>
<if test="avgCurrent != null">avg_current = #{avgCurrent},</if>
</trim>
where id = #{id}
</update>

View File

@ -59,10 +59,32 @@
<result property="minCellSohId" column="min_cell_soh_id" />
<result property="totalChargeEnergy" column="total_charge_energy" />
<result property="totalDischargeEnergy" column="total_discharge_energy" />
<result property="disconnectDetectionIndication" column="disconnect_detection_indication" />
<result property="voltageTransforRatio" column="voltage_transfor_ratio" />
<result property="ratedPrimaryCurrentValue" column="rated_primary_current_value" />
<result property="switchInputOutputStatus" column="switch_input_output_status" />
<result property="alarmStatus" column="alarm_status" />
<result property="currentTotalVoltagePercent" column="current_total_voltage_percent" />
<result property="voltageContentPercent" column="voltage_content_percent" />
<result property="voltageAcPercent" column="voltage_ac_percent" />
<result property="currentTotalCurrentPercent" column="current_total_current_percent" />
<result property="currentContentPercent" column="current_content_percent" />
<result property="currentAcPercent" column="current_ac_percent" />
<result property="currentTotalPowerPercent" column="current_total_power_percent" />
<result property="powerContentPercent" column="power_content_percent" />
<result property="powerAcPercent" column="power_ac_percent" />
<result property="dataSettingYearMonth" column="data_setting_year_month" />
<result property="dataSettingDayHour" column="data_setting_day_hour" />
<result property="dataSettingMinutesSeconds" column="data_setting_minutes_seconds" />
<result property="currentRate" column="current_rate" />
<result property="versionNumber" column="version_number" />
<result property="voltage" column="voltage" />
<result property="current" column="current" />
<result property="power" column="power" />
</resultMap>
<sql id="selectEmsBatteryClusterVo">
select id, work_status, pcs_communication_status, ems_communication_status, cluster_voltage, chargeable_capacity, total_charged_capacity, cluster_current, dischargeable_capacity, total_discharged_capacity, soh, average_temperature, insulation_resistance, current_soc, create_by, create_time, update_by, update_time, remark, site_id, device_id, stack_device_id, max_allowed_charge_power, max_allowed_discharge_power, max_allowed_charge_voltage, max_allowed_discharge_voltage, max_allowed_charge_current, max_allowed_discharge_current, battery_pack_voltage, battery_pack_current, battery_pack_temp, battery_pack_soc, battery_pack_soh, battery_pack_insulation_resistance, avg_cell_voltage, avg_cell_temp, max_cell_voltage, max_cell_voltage_id, min_cell_voltage, min_cell_voltage_id, max_cell_temp, max_cell_temp_id, min_cell_temp, min_cell_temp_id, max_cell_soc, max_cell_soc_id, min_cell_soc, min_cell_soc_id, max_cell_soh, max_cell_soh_id, min_cell_soh, min_cell_soh_id, total_charge_energy, total_discharge_energy from ems_battery_cluster
select id, work_status, pcs_communication_status, ems_communication_status, cluster_voltage, chargeable_capacity, total_charged_capacity, cluster_current, dischargeable_capacity, total_discharged_capacity, soh, average_temperature, insulation_resistance, current_soc, create_by, create_time, update_by, update_time, remark, site_id, device_id, stack_device_id, max_allowed_charge_power, max_allowed_discharge_power, max_allowed_charge_voltage, max_allowed_discharge_voltage, max_allowed_charge_current, max_allowed_discharge_current, battery_pack_voltage, battery_pack_current, battery_pack_temp, battery_pack_soc, battery_pack_soh, battery_pack_insulation_resistance, avg_cell_voltage, avg_cell_temp, max_cell_voltage, max_cell_voltage_id, min_cell_voltage, min_cell_voltage_id, max_cell_temp, max_cell_temp_id, min_cell_temp, min_cell_temp_id, max_cell_soc, max_cell_soc_id, min_cell_soc, min_cell_soc_id, max_cell_soh, max_cell_soh_id, min_cell_soh, min_cell_soh_id, total_charge_energy, total_discharge_energy, disconnect_detection_indication, voltage_transfor_ratio, rated_primary_current_value, switch_input_output_status, alarm_status, current_total_voltage_percent, voltage_content_percent, voltage_ac_percent, current_total_current_percent, current_content_percent, current_ac_percent, current_total_power_percent, power_content_percent, power_ac_percent, data_setting_year_month, data_setting_day_hour, data_setting_minutes_seconds, current_rate, version_number, voltage, current, power from ems_battery_cluster
</sql>
<select id="selectEmsBatteryClusterList" parameterType="EmsBatteryCluster" resultMap="EmsBatteryClusterResult">
@ -116,6 +138,28 @@
<if test="minCellSohId != null "> and min_cell_soh_id = #{minCellSohId}</if>
<if test="totalChargeEnergy != null "> and total_charge_energy = #{totalChargeEnergy}</if>
<if test="totalDischargeEnergy != null "> and total_discharge_energy = #{totalDischargeEnergy}</if>
<if test="disconnectDetectionIndication != null and disconnectDetectionIndication != ''"> and disconnect_detection_indication = #{disconnectDetectionIndication}</if>
<if test="voltageTransforRatio != null "> and voltage_transfor_ratio = #{voltageTransforRatio}</if>
<if test="ratedPrimaryCurrentValue != null "> and rated_primary_current_value = #{ratedPrimaryCurrentValue}</if>
<if test="switchInputOutputStatus != null and switchInputOutputStatus != ''"> and switch_input_output_status = #{switchInputOutputStatus}</if>
<if test="alarmStatus != null and alarmStatus != ''"> and alarm_status = #{alarmStatus}</if>
<if test="currentTotalVoltagePercent != null "> and current_total_voltage_percent = #{currentTotalVoltagePercent}</if>
<if test="voltageContentPercent != null "> and voltage_content_percent = #{voltageContentPercent}</if>
<if test="voltageAcPercent != null "> and voltage_ac_percent = #{voltageAcPercent}</if>
<if test="currentTotalCurrentPercent != null "> and current_total_current_percent = #{currentTotalCurrentPercent}</if>
<if test="currentContentPercent != null "> and current_content_percent = #{currentContentPercent}</if>
<if test="currentAcPercent != null "> and current_ac_percent = #{currentAcPercent}</if>
<if test="currentTotalPowerPercent != null "> and current_total_power_percent = #{currentTotalPowerPercent}</if>
<if test="powerContentPercent != null "> and power_content_percent = #{powerContentPercent}</if>
<if test="powerAcPercent != null "> and power_ac_percent = #{powerAcPercent}</if>
<if test="dataSettingYearMonth != null and dataSettingYearMonth != ''"> and data_setting_year_month = #{dataSettingYearMonth}</if>
<if test="dataSettingDayHour != null and dataSettingDayHour != ''"> and data_setting_day_hour = #{dataSettingDayHour}</if>
<if test="dataSettingMinutesSeconds != null and dataSettingMinutesSeconds != ''"> and data_setting_minutes_seconds = #{dataSettingMinutesSeconds}</if>
<if test="currentRate != null "> and current_rate = #{currentRate}</if>
<if test="versionNumber != null and versionNumber != ''"> and version_number = #{versionNumber}</if>
<if test="voltage != null "> and voltage = #{voltage}</if>
<if test="current != null "> and current = #{current}</if>
<if test="power != null "> and power = #{power}</if>
</where>
</select>
@ -180,6 +224,28 @@
<if test="minCellSohId != null">min_cell_soh_id,</if>
<if test="totalChargeEnergy != null">total_charge_energy,</if>
<if test="totalDischargeEnergy != null">total_discharge_energy,</if>
<if test="disconnectDetectionIndication != null">disconnect_detection_indication,</if>
<if test="voltageTransforRatio != null">voltage_transfor_ratio,</if>
<if test="ratedPrimaryCurrentValue != null">rated_primary_current_value,</if>
<if test="switchInputOutputStatus != null">switch_input_output_status,</if>
<if test="alarmStatus != null">alarm_status,</if>
<if test="currentTotalVoltagePercent != null">current_total_voltage_percent,</if>
<if test="voltageContentPercent != null">voltage_content_percent,</if>
<if test="voltageAcPercent != null">voltage_ac_percent,</if>
<if test="currentTotalCurrentPercent != null">current_total_current_percent,</if>
<if test="currentContentPercent != null">current_content_percent,</if>
<if test="currentAcPercent != null">current_ac_percent,</if>
<if test="currentTotalPowerPercent != null">current_total_power_percent,</if>
<if test="powerContentPercent != null">power_content_percent,</if>
<if test="powerAcPercent != null">power_ac_percent,</if>
<if test="dataSettingYearMonth != null">data_setting_year_month,</if>
<if test="dataSettingDayHour != null">data_setting_day_hour,</if>
<if test="dataSettingMinutesSeconds != null">data_setting_minutes_seconds,</if>
<if test="currentRate != null">current_rate,</if>
<if test="versionNumber != null">version_number,</if>
<if test="voltage != null">voltage,</if>
<if test="current != null">current,</if>
<if test="power != null">power,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workStatus != null">#{workStatus},</if>
@ -235,6 +301,28 @@
<if test="minCellSohId != null">#{minCellSohId},</if>
<if test="totalChargeEnergy != null">#{totalChargeEnergy},</if>
<if test="totalDischargeEnergy != null">#{totalDischargeEnergy},</if>
<if test="disconnectDetectionIndication != null">#{disconnectDetectionIndication},</if>
<if test="voltageTransforRatio != null">#{voltageTransforRatio},</if>
<if test="ratedPrimaryCurrentValue != null">#{ratedPrimaryCurrentValue},</if>
<if test="switchInputOutputStatus != null">#{switchInputOutputStatus},</if>
<if test="alarmStatus != null">#{alarmStatus},</if>
<if test="currentTotalVoltagePercent != null">#{currentTotalVoltagePercent},</if>
<if test="voltageContentPercent != null">#{voltageContentPercent},</if>
<if test="voltageAcPercent != null">#{voltageAcPercent},</if>
<if test="currentTotalCurrentPercent != null">#{currentTotalCurrentPercent},</if>
<if test="currentContentPercent != null">#{currentContentPercent},</if>
<if test="currentAcPercent != null">#{currentAcPercent},</if>
<if test="currentTotalPowerPercent != null">#{currentTotalPowerPercent},</if>
<if test="powerContentPercent != null">#{powerContentPercent},</if>
<if test="powerAcPercent != null">#{powerAcPercent},</if>
<if test="dataSettingYearMonth != null">#{dataSettingYearMonth},</if>
<if test="dataSettingDayHour != null">#{dataSettingDayHour},</if>
<if test="dataSettingMinutesSeconds != null">#{dataSettingMinutesSeconds},</if>
<if test="currentRate != null">#{currentRate},</if>
<if test="versionNumber != null">#{versionNumber},</if>
<if test="voltage != null">#{voltage},</if>
<if test="current != null">#{current},</if>
<if test="power != null">#{power},</if>
</trim>
</insert>
@ -294,6 +382,28 @@
<if test="minCellSohId != null">min_cell_soh_id = #{minCellSohId},</if>
<if test="totalChargeEnergy != null">total_charge_energy = #{totalChargeEnergy},</if>
<if test="totalDischargeEnergy != null">total_discharge_energy = #{totalDischargeEnergy},</if>
<if test="disconnectDetectionIndication != null">disconnect_detection_indication = #{disconnectDetectionIndication},</if>
<if test="voltageTransforRatio != null">voltage_transfor_ratio = #{voltageTransforRatio},</if>
<if test="ratedPrimaryCurrentValue != null">rated_primary_current_value = #{ratedPrimaryCurrentValue},</if>
<if test="switchInputOutputStatus != null">switch_input_output_status = #{switchInputOutputStatus},</if>
<if test="alarmStatus != null">alarm_status = #{alarmStatus},</if>
<if test="currentTotalVoltagePercent != null">current_total_voltage_percent = #{currentTotalVoltagePercent},</if>
<if test="voltageContentPercent != null">voltage_content_percent = #{voltageContentPercent},</if>
<if test="voltageAcPercent != null">voltage_ac_percent = #{voltageAcPercent},</if>
<if test="currentTotalCurrentPercent != null">current_total_current_percent = #{currentTotalCurrentPercent},</if>
<if test="currentContentPercent != null">current_content_percent = #{currentContentPercent},</if>
<if test="currentAcPercent != null">current_ac_percent = #{currentAcPercent},</if>
<if test="currentTotalPowerPercent != null">current_total_power_percent = #{currentTotalPowerPercent},</if>
<if test="powerContentPercent != null">power_content_percent = #{powerContentPercent},</if>
<if test="powerAcPercent != null">power_ac_percent = #{powerAcPercent},</if>
<if test="dataSettingYearMonth != null">data_setting_year_month = #{dataSettingYearMonth},</if>
<if test="dataSettingDayHour != null">data_setting_day_hour = #{dataSettingDayHour},</if>
<if test="dataSettingMinutesSeconds != null">data_setting_minutes_seconds = #{dataSettingMinutesSeconds},</if>
<if test="currentRate != null">current_rate = #{currentRate},</if>
<if test="versionNumber != null">version_number = #{versionNumber},</if>
<if test="voltage != null">voltage = #{voltage},</if>
<if test="current != null">current = #{current},</if>
<if test="power != null">power = #{power},</if>
</trim>
where id = #{id}
</update>

View File

@ -52,10 +52,24 @@
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="batteryNumber" column="battery_number" />
<result property="batteryAvgVoltage" column="battery_avg_voltage" />
<result property="batteryDifferentPressure" column="battery_different_pressure" />
<result property="avgTemperature" column="avg_temperature" />
<result property="batteryDifferentTemperature" column="battery_different_temperature" />
<result property="maxInternalResistance" column="max_internal_resistance" />
<result property="minInternalResistance" column="min_internal_resistance" />
<result property="avgInternalResistance" column="avg_internal_resistance" />
<result property="batteryDefferentResistance" column="battery_defferent_resistance" />
<result property="maxResistanceCellId" column="max_resistance_cell_id" />
<result property="minResistanceCellId" column="min_resistance_cell_id" />
<result property="environmentTemperature" column="environment_temperature" />
<result property="environmentHumidity" column="environment_humidity" />
<result property="circuitBreakerStatus" column="circuit_breaker_status" />
</resultMap>
<sql id="selectEmsBatteryStackVo">
select id, work_status, pcs_communication_status, ems_communication_status, operation_status, stack_voltage, stack_current, stack_soc, stack_soh, max_cell_voltage, max_voltage_group_id, max_voltage_cell_id, min_cell_voltage, min_voltage_group_id, min_voltage_cell_id, max_cell_temp, max_temp_group_id, max_temp_cell_id, min_cell_temp, min_temp_group_id, min_temp_cell_id, total_charge_capacity, total_discharge_capacity, session_charge_capacity, session_discharge_capacity, available_charge_capacity, available_discharge_capacity, remaining_discharge_time, remaining_charge_time, max_discharge_power, max_charge_power, max_discharge_current, max_charge_current, daily_discharge_cycles, daily_charge_cycles, daily_discharge_capacity, daily_charge_capacity, operating_temp, bms_status, bms_charge_status, stack_insulation_resistance, site_id, device_id, create_time, create_by, update_time, update_by from ems_battery_stack
select id, work_status, pcs_communication_status, ems_communication_status, operation_status, stack_voltage, stack_current, stack_soc, stack_soh, max_cell_voltage, max_voltage_group_id, max_voltage_cell_id, min_cell_voltage, min_voltage_group_id, min_voltage_cell_id, max_cell_temp, max_temp_group_id, max_temp_cell_id, min_cell_temp, min_temp_group_id, min_temp_cell_id, total_charge_capacity, total_discharge_capacity, session_charge_capacity, session_discharge_capacity, available_charge_capacity, available_discharge_capacity, remaining_discharge_time, remaining_charge_time, max_discharge_power, max_charge_power, max_discharge_current, max_charge_current, daily_discharge_cycles, daily_charge_cycles, daily_discharge_capacity, daily_charge_capacity, operating_temp, bms_status, bms_charge_status, stack_insulation_resistance, site_id, device_id, create_time, create_by, update_time, update_by, battery_number, battery_avg_voltage, battery_different_pressure, avg_temperature, battery_different_temperature, max_internal_resistance, min_internal_resistance, avg_internal_resistance, battery_defferent_resistance, max_resistance_cell_id, min_resistance_cell_id, environment_temperature, environment_humidity, circuit_breaker_status from ems_battery_stack
</sql>
<select id="selectEmsBatteryStackList" parameterType="EmsBatteryStack" resultMap="EmsBatteryStackResult">
@ -103,6 +117,20 @@
<if test="stackInsulationResistance != null "> and stack_insulation_resistance = #{stackInsulationResistance}</if>
<if test="siteId != null and siteId != ''"> and site_id = #{siteId}</if>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="batteryNumber != null "> and battery_number = #{batteryNumber}</if>
<if test="batteryAvgVoltage != null "> and battery_avg_voltage = #{batteryAvgVoltage}</if>
<if test="batteryDifferentPressure != null "> and battery_different_pressure = #{batteryDifferentPressure}</if>
<if test="avgTemperature != null "> and avg_temperature = #{avgTemperature}</if>
<if test="batteryDifferentTemperature != null "> and battery_different_temperature = #{batteryDifferentTemperature}</if>
<if test="maxInternalResistance != null "> and max_internal_resistance = #{maxInternalResistance}</if>
<if test="minInternalResistance != null "> and min_internal_resistance = #{minInternalResistance}</if>
<if test="avgInternalResistance != null "> and avg_internal_resistance = #{avgInternalResistance}</if>
<if test="batteryDefferentResistance != null "> and battery_defferent_resistance = #{batteryDefferentResistance}</if>
<if test="maxResistanceCellId != null "> and max_resistance_cell_id = #{maxResistanceCellId}</if>
<if test="minResistanceCellId != null "> and min_resistance_cell_id = #{minResistanceCellId}</if>
<if test="environmentTemperature != null "> and environment_temperature = #{environmentTemperature}</if>
<if test="environmentHumidity != null "> and environment_humidity = #{environmentHumidity}</if>
<if test="circuitBreakerStatus != null and circuitBreakerStatus != ''"> and circuit_breaker_status = #{circuitBreakerStatus}</if>
</where>
</select>
@ -160,6 +188,20 @@
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="batteryNumber != null">battery_number,</if>
<if test="batteryAvgVoltage != null">battery_avg_voltage,</if>
<if test="batteryDifferentPressure != null">battery_different_pressure,</if>
<if test="avgTemperature != null">avg_temperature,</if>
<if test="batteryDifferentTemperature != null">battery_different_temperature,</if>
<if test="maxInternalResistance != null">max_internal_resistance,</if>
<if test="minInternalResistance != null">min_internal_resistance,</if>
<if test="avgInternalResistance != null">avg_internal_resistance,</if>
<if test="batteryDefferentResistance != null">battery_defferent_resistance,</if>
<if test="maxResistanceCellId != null">max_resistance_cell_id,</if>
<if test="minResistanceCellId != null">min_resistance_cell_id,</if>
<if test="environmentTemperature != null">environment_temperature,</if>
<if test="environmentHumidity != null">environment_humidity,</if>
<if test="circuitBreakerStatus != null">circuit_breaker_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workStatus != null">#{workStatus},</if>
@ -208,6 +250,20 @@
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="batteryNumber != null">#{batteryNumber},</if>
<if test="batteryAvgVoltage != null">#{batteryAvgVoltage},</if>
<if test="batteryDifferentPressure != null">#{batteryDifferentPressure},</if>
<if test="avgTemperature != null">#{avgTemperature},</if>
<if test="batteryDifferentTemperature != null">#{batteryDifferentTemperature},</if>
<if test="maxInternalResistance != null">#{maxInternalResistance},</if>
<if test="minInternalResistance != null">#{minInternalResistance},</if>
<if test="avgInternalResistance != null">#{avgInternalResistance},</if>
<if test="batteryDefferentResistance != null">#{batteryDefferentResistance},</if>
<if test="maxResistanceCellId != null">#{maxResistanceCellId},</if>
<if test="minResistanceCellId != null">#{minResistanceCellId},</if>
<if test="environmentTemperature != null">#{environmentTemperature},</if>
<if test="environmentHumidity != null">#{environmentHumidity},</if>
<if test="circuitBreakerStatus != null">#{circuitBreakerStatus},</if>
</trim>
</insert>
@ -260,6 +316,20 @@
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="batteryNumber != null">battery_number = #{batteryNumber},</if>
<if test="batteryAvgVoltage != null">battery_avg_voltage = #{batteryAvgVoltage},</if>
<if test="batteryDifferentPressure != null">battery_different_pressure = #{batteryDifferentPressure},</if>
<if test="avgTemperature != null">avg_temperature = #{avgTemperature},</if>
<if test="batteryDifferentTemperature != null">battery_different_temperature = #{batteryDifferentTemperature},</if>
<if test="maxInternalResistance != null">max_internal_resistance = #{maxInternalResistance},</if>
<if test="minInternalResistance != null">min_internal_resistance = #{minInternalResistance},</if>
<if test="avgInternalResistance != null">avg_internal_resistance = #{avgInternalResistance},</if>
<if test="batteryDefferentResistance != null">battery_defferent_resistance = #{batteryDefferentResistance},</if>
<if test="maxResistanceCellId != null">max_resistance_cell_id = #{maxResistanceCellId},</if>
<if test="minResistanceCellId != null">min_resistance_cell_id = #{minResistanceCellId},</if>
<if test="environmentTemperature != null">environment_temperature = #{environmentTemperature},</if>
<if test="environmentHumidity != null">environment_humidity = #{environmentHumidity},</if>
<if test="circuitBreakerStatus != null">circuit_breaker_status = #{circuitBreakerStatus},</if>
</trim>
where id = #{id}
</update>

View File

@ -56,10 +56,11 @@
<result property="sysUCurrent" column="sys_u_current" />
<result property="sysVCurrent" column="sys_v_current" />
<result property="sysWCurrent" column="sys_w_current" />
<result property="dwFrequency" column="dw_frequency" />
</resultMap>
<sql id="selectEmsPcsDataVo">
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
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, dw_frequency from ems_pcs_data
</sql>
<select id="selectEmsPcsDataList" parameterType="EmsPcsData" resultMap="EmsPcsDataResult">
@ -110,6 +111,7 @@
<if test="sysUCurrent != null "> and sys_u_current = #{sysUCurrent}</if>
<if test="sysVCurrent != null "> and sys_v_current = #{sysVCurrent}</if>
<if test="sysWCurrent != null "> and sys_w_current = #{sysWCurrent}</if>
<if test="dwFrequency != null "> and dw_frequency = #{dwFrequency}</if>
</where>
</select>
@ -171,6 +173,7 @@
<if test="sysUCurrent != null">sys_u_current,</if>
<if test="sysVCurrent != null">sys_v_current,</if>
<if test="sysWCurrent != null">sys_w_current,</if>
<if test="dwFrequency != null">dw_frequency,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dataUpdateTime != null">#{dataUpdateTime},</if>
@ -223,6 +226,7 @@
<if test="sysUCurrent != null">#{sysUCurrent},</if>
<if test="sysVCurrent != null">#{sysVCurrent},</if>
<if test="sysWCurrent != null">#{sysWCurrent},</if>
<if test="dwFrequency != null">#{dwFrequency},</if>
</trim>
</insert>
@ -279,6 +283,7 @@
<if test="sysUCurrent != null">sys_u_current = #{sysUCurrent},</if>
<if test="sysVCurrent != null">sys_v_current = #{sysVCurrent},</if>
<if test="sysWCurrent != null">sys_w_current = #{sysWCurrent},</if>
<if test="dwFrequency != null">dw_frequency = #{dwFrequency},</if>
</trim>
where id = #{id}
</update>