From 7b64e193fccf3d7bb3b444a5d1e38971974a121a Mon Sep 17 00:00:00 2001 From: mashili Date: Tue, 24 Jun 2025 17:04:59 +0800 Subject: [PATCH] =?UTF-8?q?PCS=E6=8A=BD=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteMonitorController.java | 18 ++ .../com/xzzn/ems/domain/EmsPcsBranchData.java | 149 +++++++++ .../java/com/xzzn/ems/domain/EmsPcsData.java | 16 + .../com/xzzn/ems/domain/vo/PcsBranchInfo.java | 91 ++++++ .../xzzn/ems/domain/vo/PcsDetailInfoVo.java | 284 ++++++++++++++++++ .../ems/mapper/EmsPcsBranchDataMapper.java | 71 +++++ .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 4 +- .../xzzn/ems/service/ISingleSiteService.java | 5 +- .../service/impl/SingleSiteServiceImpl.java | 33 +- .../mapper/ems/EmsPcsBranchDataMapper.xml | 118 ++++++++ .../resources/mapper/ems/EmsPcsDataMapper.xml | 24 +- 11 files changed, 801 insertions(+), 12 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsDetailInfoVo.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java create mode 100644 ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java index cf3597c..bc1c2b7 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java @@ -71,4 +71,22 @@ public class EmsSiteMonitorController extends BaseController{ { return success(iSingleSiteService.getBMSBatteryCluster(siteId)); } + + /** + * 获取所有电池堆 + */ + @GetMapping("/getStackNameList") + public AjaxResult getStackNameList(@RequestParam Long siteId) + { + return success(iSingleSiteService.getBMSBatteryCluster(siteId)); + } + + /** + * 获取所有电池簇 + */ + @GetMapping("/getClusterNameList") + public AjaxResult getClusterNameList(@RequestParam Long siteId) + { + return success(iSingleSiteService.getBMSBatteryCluster(siteId)); + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java new file mode 100644 index 0000000..7fefdcc --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java @@ -0,0 +1,149 @@ +package com.xzzn.ems.domain; + +import java.math.BigDecimal; + +import com.xzzn.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xzzn.common.annotation.Excel; + +/** + * pcs支路数据对象 ems_pcs_branch_data + * + * @author xzzn + * @date 2025-06-24 + */ +public class EmsPcsBranchData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 放电状态 */ + @Excel(name = "放电状态") + private String dischargeStatus; + + /** 直流功率 (kW) */ + @Excel(name = "直流功率 (kW)") + private BigDecimal dcPower; + + /** 直流电压 (V) */ + @Excel(name = "直流电压 (V)") + private BigDecimal dcVoltage; + + /** 直流电流 (A) */ + @Excel(name = "直流电流 (A)") + private BigDecimal dcCurrent; + + /** 站点id */ + @Excel(name = "站点id") + private Long siteId; + + /** 设备唯一标识符 */ + @Excel(name = "设备唯一标识符") + private Long deviceId; + + /** 支路id */ + @Excel(name = "支路id") + private Long branchId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setDischargeStatus(String dischargeStatus) + { + this.dischargeStatus = dischargeStatus; + } + + public String getDischargeStatus() + { + return dischargeStatus; + } + + public void setDcPower(BigDecimal dcPower) + { + this.dcPower = dcPower; + } + + public BigDecimal getDcPower() + { + return dcPower; + } + + public void setDcVoltage(BigDecimal dcVoltage) + { + this.dcVoltage = dcVoltage; + } + + public BigDecimal getDcVoltage() + { + return dcVoltage; + } + + public void setDcCurrent(BigDecimal dcCurrent) + { + this.dcCurrent = dcCurrent; + } + + public BigDecimal getDcCurrent() + { + return dcCurrent; + } + + public void setSiteId(Long siteId) + { + this.siteId = siteId; + } + + public Long getSiteId() + { + return siteId; + } + + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + + public void setBranchId(Long branchId) + { + this.branchId = branchId; + } + + public Long getBranchId() + { + return branchId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("dischargeStatus", getDischargeStatus()) + .append("dcPower", getDcPower()) + .append("dcVoltage", getDcVoltage()) + .append("dcCurrent", getDcCurrent()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("siteId", getSiteId()) + .append("deviceId", getDeviceId()) + .append("branchId", getBranchId()) + .toString(); + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java index 1275da3..031d813 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java @@ -138,6 +138,10 @@ public class EmsPcsData extends BaseEntity @Excel(name = "日") private int dateDay; + /** 通信状态 */ + @Excel(name = "通信状态") + private String communicationStatus; + public void setId(Long id) { this.id = id; @@ -434,6 +438,16 @@ public class EmsPcsData extends BaseEntity this.dateDay = dateDay; } + public void setCommunicationStatus(String communicationStatus) + { + this.communicationStatus = communicationStatus; + } + + public String getCommunicationStatus() + { + return communicationStatus; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -472,6 +486,8 @@ public class EmsPcsData extends BaseEntity .append("deviceId", getDeviceId()) .append("dateMonth", getDateMonth()) .append("dateDay", getDateDay()) + .append("communicationStatus", getCommunicationStatus()) .toString(); } } + diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java new file mode 100644 index 0000000..6b61911 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java @@ -0,0 +1,91 @@ +package com.xzzn.ems.domain.vo; + +import java.math.BigDecimal; + +/** + * PCS支路数据 + * + * @author xzzn + * @date 2025-06-24 + */ +public class PcsBranchInfo +{ + private static final long serialVersionUID = 1L; + + /** 放电状态 */ + private String dischargeStatus; + + /** 直流功率 (kW) */ + private BigDecimal dcPower; + + /** 直流电压 (V) */ + private BigDecimal dcVoltage; + + /** 直流电流 (A) */ + private BigDecimal dcCurrent; + + /** 站点id */ + private Long siteId; + + /** 设备唯一标识符 */ + private Long deviceId; + + /** 支路id */ + private Long branchId; + + public String getDischargeStatus() { + return dischargeStatus; + } + + public void setDischargeStatus(String dischargeStatus) { + this.dischargeStatus = dischargeStatus; + } + + public BigDecimal getDcPower() { + return dcPower; + } + + public void setDcPower(BigDecimal dcPower) { + this.dcPower = dcPower; + } + + public BigDecimal getDcVoltage() { + return dcVoltage; + } + + public void setDcVoltage(BigDecimal dcVoltage) { + this.dcVoltage = dcVoltage; + } + + public BigDecimal getDcCurrent() { + return dcCurrent; + } + + public void setDcCurrent(BigDecimal dcCurrent) { + this.dcCurrent = dcCurrent; + } + + public Long getSiteId() { + return siteId; + } + + public void setSiteId(Long siteId) { + this.siteId = siteId; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Long getBranchId() { + return branchId; + } + + public void setBranchId(Long branchId) { + this.branchId = branchId; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsDetailInfoVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsDetailInfoVo.java new file mode 100644 index 0000000..e20980e --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsDetailInfoVo.java @@ -0,0 +1,284 @@ +package com.xzzn.ems.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xzzn.common.annotation.Excel; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 单个PCS详细数据 + * + * @author xzzn + * @date 2025-06-24 + */ +public class PcsDetailInfoVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** 通讯状态 */ + private String communicationStatus; + + /** 数据更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataUpdateTime; + + /** 工作状态 */ + private String workStatus; + + /** 并网状态 */ + private String gridStatus; + + /** 设备状态 */ + private String deviceStatus; + + /** 控制模式 */ + private String controlMode; + + /** 总交流有功电率 (kW) */ + private BigDecimal totalActivePower; + + /** 当天交流充电量 (kWh) */ + private BigDecimal dailyAcChargeEnergy; + + /** A相电压 (V) */ + private BigDecimal aPhaseVoltage; + + /** A相电流 (A) */ + private BigDecimal aPhaseCurrent; + + /** 总交流无功电率 (kVar) */ + private BigDecimal totalReactivePower; + + /** 当天交流放电量 (kWh) */ + @Excel(name = " (kWh)") + private BigDecimal dailyAcDischargeEnergy; + + /** B相电压 (V) */ + private BigDecimal bPhaseVoltage; + + /** B相电流 (A) */ + private BigDecimal bPhaseCurrent; + + /** 总交流视在功率 (kVA) */ + private BigDecimal totalApparentPower; + + /** PCS模块温度 (℃) */ + private BigDecimal pcsModuleTemperature; + + /** C相电压 (V) */ + private BigDecimal cPhaseVoltage; + + /** C相电流 (A) */ + private BigDecimal cPhaseCurrent; + + /** 总交流功率因数 */ + private BigDecimal totalPowerFactor; + + /** PCS环境温度 (℃) */ + private BigDecimal pcsEnvironmentTemperature; + + /** 交流频率 (Hz) */ + private BigDecimal acFrequency; + + /** 站点id */ + private Long siteId; + + /** 设备唯一标识符 */ + private Long deviceId; + + private List pcsBranchInfoList; + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Long getSiteId() { + return siteId; + } + + public void setSiteId(Long siteId) { + this.siteId = siteId; + } + + public BigDecimal getAcFrequency() { + return acFrequency; + } + + public void setAcFrequency(BigDecimal acFrequency) { + this.acFrequency = acFrequency; + } + + public BigDecimal getPcsEnvironmentTemperature() { + return pcsEnvironmentTemperature; + } + + public void setPcsEnvironmentTemperature(BigDecimal pcsEnvironmentTemperature) { + this.pcsEnvironmentTemperature = pcsEnvironmentTemperature; + } + + public BigDecimal getTotalPowerFactor() { + return totalPowerFactor; + } + + public void setTotalPowerFactor(BigDecimal totalPowerFactor) { + this.totalPowerFactor = totalPowerFactor; + } + + public BigDecimal getcPhaseCurrent() { + return cPhaseCurrent; + } + + public void setcPhaseCurrent(BigDecimal cPhaseCurrent) { + this.cPhaseCurrent = cPhaseCurrent; + } + + public BigDecimal getcPhaseVoltage() { + return cPhaseVoltage; + } + + public void setcPhaseVoltage(BigDecimal cPhaseVoltage) { + this.cPhaseVoltage = cPhaseVoltage; + } + + public BigDecimal getPcsModuleTemperature() { + return pcsModuleTemperature; + } + + public void setPcsModuleTemperature(BigDecimal pcsModuleTemperature) { + this.pcsModuleTemperature = pcsModuleTemperature; + } + + public BigDecimal getTotalApparentPower() { + return totalApparentPower; + } + + public void setTotalApparentPower(BigDecimal totalApparentPower) { + this.totalApparentPower = totalApparentPower; + } + + public BigDecimal getbPhaseCurrent() { + return bPhaseCurrent; + } + + public void setbPhaseCurrent(BigDecimal bPhaseCurrent) { + this.bPhaseCurrent = bPhaseCurrent; + } + + public BigDecimal getbPhaseVoltage() { + return bPhaseVoltage; + } + + public void setbPhaseVoltage(BigDecimal bPhaseVoltage) { + this.bPhaseVoltage = bPhaseVoltage; + } + + public BigDecimal getDailyAcDischargeEnergy() { + return dailyAcDischargeEnergy; + } + + public void setDailyAcDischargeEnergy(BigDecimal dailyAcDischargeEnergy) { + this.dailyAcDischargeEnergy = dailyAcDischargeEnergy; + } + + public BigDecimal getTotalReactivePower() { + return totalReactivePower; + } + + public void setTotalReactivePower(BigDecimal totalReactivePower) { + this.totalReactivePower = totalReactivePower; + } + + public BigDecimal getaPhaseCurrent() { + return aPhaseCurrent; + } + + public void setaPhaseCurrent(BigDecimal aPhaseCurrent) { + this.aPhaseCurrent = aPhaseCurrent; + } + + public BigDecimal getaPhaseVoltage() { + return aPhaseVoltage; + } + + public void setaPhaseVoltage(BigDecimal aPhaseVoltage) { + this.aPhaseVoltage = aPhaseVoltage; + } + + public BigDecimal getDailyAcChargeEnergy() { + return dailyAcChargeEnergy; + } + + public void setDailyAcChargeEnergy(BigDecimal dailyAcChargeEnergy) { + this.dailyAcChargeEnergy = dailyAcChargeEnergy; + } + + public BigDecimal getTotalActivePower() { + return totalActivePower; + } + + public void setTotalActivePower(BigDecimal totalActivePower) { + this.totalActivePower = totalActivePower; + } + + public String getControlMode() { + return controlMode; + } + + public void setControlMode(String controlMode) { + this.controlMode = controlMode; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getGridStatus() { + return gridStatus; + } + + public void setGridStatus(String gridStatus) { + this.gridStatus = gridStatus; + } + + public String getWorkStatus() { + return workStatus; + } + + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + + public Date getDataUpdateTime() { + return dataUpdateTime; + } + + public void setDataUpdateTime(Date dataUpdateTime) { + this.dataUpdateTime = dataUpdateTime; + } + + public List getPcsBranchInfoList() { + return pcsBranchInfoList; + } + + public String getCommunicationStatus() { + return communicationStatus; + } + + public void setCommunicationStatus(String communicationStatus) { + this.communicationStatus = communicationStatus; + } + + public void setPcsBranchInfoList(List pcsBranchInfoList) { + this.pcsBranchInfoList = pcsBranchInfoList; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java new file mode 100644 index 0000000..80baed6 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java @@ -0,0 +1,71 @@ +package com.xzzn.ems.mapper; + +import java.util.List; +import com.xzzn.ems.domain.EmsPcsBranchData; +import com.xzzn.ems.domain.vo.PcsBranchInfo; +import org.apache.ibatis.annotations.Param; + +/** + * pcs支路数据Mapper接口 + * + * @author xzzn + * @date 2025-06-24 + */ +public interface EmsPcsBranchDataMapper +{ + /** + * 查询pcs支路数据 + * + * @param id pcs支路数据主键 + * @return pcs支路数据 + */ + public EmsPcsBranchData selectEmsPcsBranchDataById(Long id); + + /** + * 查询pcs支路数据列表 + * + * @param emsPcsBranchData pcs支路数据 + * @return pcs支路数据集合 + */ + public List selectEmsPcsBranchDataList(EmsPcsBranchData emsPcsBranchData); + + /** + * 新增pcs支路数据 + * + * @param emsPcsBranchData pcs支路数据 + * @return 结果 + */ + public int insertEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData); + + /** + * 修改pcs支路数据 + * + * @param emsPcsBranchData pcs支路数据 + * @return 结果 + */ + public int updateEmsPcsBranchData(EmsPcsBranchData emsPcsBranchData); + + /** + * 删除pcs支路数据 + * + * @param id pcs支路数据主键 + * @return 结果 + */ + public int deleteEmsPcsBranchDataById(Long id); + + /** + * 批量删除pcs支路数据 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmsPcsBranchDataByIds(Long[] ids); + + /** + * 根据site_id和device_id获取支路最新数据 + * @param siteId + * @param deviceId + * @return + */ + public List getPcsBranchInfoList(@Param("siteId")Long siteId, @Param("deviceId")Long deviceId); +} diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java index 16efb63..8d224be 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java @@ -92,9 +92,9 @@ public interface EmsPcsDataMapper public List getElectDataList(); /** - * 根据site_id获取pcs最新update的数据 + * 根据site_id获取所有pcs最新update的数据 * @param siteId * @return */ - public EmsPcsData getPcsDetailInfoBySiteId(Long siteId); + public List getPcsDetailInfoBySiteId(Long siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java index 67dc9fc..7eccbb0 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java @@ -1,8 +1,9 @@ package com.xzzn.ems.service; -import com.xzzn.ems.domain.EmsPcsData; import com.xzzn.ems.domain.vo.*; +import java.util.List; + /** * 单点监控 服务层 * @@ -17,7 +18,7 @@ public interface ISingleSiteService public SiteMonitorRuningInfoVo getRunningGraph(Long siteId); - public EmsPcsData getPcsDetailInfo(Long siteId); + public List getPcsDetailInfo(Long siteId); public BMSOverViewVo getBMSOverView(Long siteId); diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index a6435c3..715b28d 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -11,8 +11,10 @@ import com.xzzn.ems.mapper.*; import com.xzzn.ems.service.ISingleSiteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Calendar; import java.util.List; @@ -32,6 +34,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { private EmsBatteryStackMapper emsBatteryStackMapper; @Autowired private EmsBatteryClusterMapper emsBatteryClusterMapper; + @Autowired + private EmsPcsBranchDataMapper emsPcsBranchDataMapper; @Override public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId) { @@ -43,7 +47,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService { siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo); // 能量数据 List siteMonitorDataVoList = emsPcsDataMapper.getPcsDataBySiteId(siteId); - if (siteMonitorDataVoList != null && !siteMonitorDataVoList.isEmpty()) { + if (!CollectionUtils.isEmpty(siteMonitorDataVoList)) { BigDecimal dayChargeCap = new BigDecimal(0); BigDecimal dayDisChargeCap = new BigDecimal(0); BigDecimal totalChargeCap = new BigDecimal(0); @@ -125,10 +129,31 @@ public class SingleSiteServiceImpl implements ISingleSiteService { return siteMonitorRuningInfoVo; } - // 根据site_id获取pcs详细数据 + // 根据site_id获取pcs详细数据+支路数据 @Override - public EmsPcsData getPcsDetailInfo(Long siteId) { - return emsPcsDataMapper.getPcsDetailInfoBySiteId(siteId); + public List getPcsDetailInfo(Long siteId) { + List pcsDetailInfoVoList = new ArrayList<>(); + + if (siteId != null) { + // 获取pcs最新数据 + List emsPcsDataList = emsPcsDataMapper.getPcsDetailInfoBySiteId(siteId); + if (!CollectionUtils.isEmpty(emsPcsDataList)) { + for (EmsPcsData sitePcsData : emsPcsDataList) { + // 赋值 + PcsDetailInfoVo pcsDetailInfoVo = new PcsDetailInfoVo(); + BeanUtils.copyProperties(sitePcsData, pcsDetailInfoVo); + + Long deviceId = sitePcsData.getDeviceId(); + // 获取支路最新数据 + if (deviceId != null) { + List pcsBranchInfoList = emsPcsBranchDataMapper.getPcsBranchInfoList(siteId, deviceId); + pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList); + } + pcsDetailInfoVoList.add(pcsDetailInfoVo); + } + } + } + return pcsDetailInfoVoList; } // 获取BMS总览数据 diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml new file mode 100644 index 0000000..65561e9 --- /dev/null +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + select id, discharge_status, dc_power, dc_voltage, dc_current, create_by, create_time, update_by, update_time, remark, site_id, device_id, branch_id from ems_pcs_branch_data + + + + + + + + insert into ems_pcs_branch_data + + discharge_status, + dc_power, + dc_voltage, + dc_current, + create_by, + create_time, + update_by, + update_time, + remark, + site_id, + device_id, + branch_id, + + + #{dischargeStatus}, + #{dcPower}, + #{dcVoltage}, + #{dcCurrent}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{siteId}, + #{deviceId}, + #{branchId}, + + + + + update ems_pcs_branch_data + + discharge_status = #{dischargeStatus}, + dc_power = #{dcPower}, + dc_voltage = #{dcVoltage}, + dc_current = #{dcCurrent}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + site_id = #{siteId}, + device_id = #{deviceId}, + branch_id = #{branchId}, + + where id = #{id} + + + + delete from ems_pcs_branch_data where id = #{id} + + + + delete from ems_pcs_branch_data where id in + + #{id} + + + + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index eb1522e..a44a16d 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -40,10 +40,11 @@ + - 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 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, communication_status from ems_pcs_data @@ -119,6 +123,9 @@ remark, site_id, device_id, + date_month, + date_day, + communication_status, #{dataUpdateTime}, @@ -153,6 +160,9 @@ #{remark}, #{siteId}, #{deviceId}, + #{dateMonth}, + #{dateDay}, + #{communicationStatus}, @@ -191,6 +201,9 @@ remark = #{remark}, site_id = #{siteId}, device_id = #{deviceId}, + date_month = #{dateMonth}, + date_day = #{dateDay}, + communication_status = #{communicationStatus}, where id = #{id} @@ -256,8 +269,11 @@ \ No newline at end of file