From d1aa8dbd2c3d6a4d150602222462af8cf50e355b Mon Sep 17 00:00:00 2001 From: mashili Date: Sun, 29 Jun 2025 10:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9site=5Fid=20&=20device=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ems/EmsSiteMapController.java | 2 +- .../ems/EmsSiteMonitorController.java | 22 +- .../controller/ems/MqttMessageController.java | 6 +- .../com/xzzn/ems/domain/EmsAlarmRecords.java | 14 +- .../com/xzzn/ems/domain/EmsAmmeterData.java | 31 +- .../xzzn/ems/domain/EmsBatteryCluster.java | 509 +++++++++++++++++- .../com/xzzn/ems/domain/EmsBatteryData.java | 16 +- .../com/xzzn/ems/domain/EmsBatteryStack.java | 494 ++++++++++++++++- .../com/xzzn/ems/domain/EmsCoolingData.java | 16 +- .../xzzn/ems/domain/EmsDevicesSetting.java | 23 +- .../com/xzzn/ems/domain/EmsPcsBranchData.java | 316 ++++++++++- .../java/com/xzzn/ems/domain/EmsPcsData.java | 8 +- .../com/xzzn/ems/domain/EmsSiteSetting.java | 19 +- .../ems/domain/vo/AmmeterDataDetailInfo.java | 6 +- .../domain/vo/BMSBatteryClusterDataList.java | 12 +- .../ems/domain/vo/BMSBatteryClusterVo.java | 12 +- .../ems/domain/vo/BMSBatteryDataList.java | 4 +- .../com/xzzn/ems/domain/vo/BMSOverViewVo.java | 12 +- .../domain/vo/BatteryClusterDataDetailVo.java | 12 +- .../ems/domain/vo/BatteryDataStatsListVo.java | 70 +-- .../domain/vo/BatteryDataStatsTemplate.java | 48 -- .../com/xzzn/ems/domain/vo/PcsBranchInfo.java | 12 +- .../xzzn/ems/domain/vo/PcsDetailInfoVo.java | 12 +- ...java => SiteMonitorRunningHeadInfoVo.java} | 2 +- .../ems/mapper/EmsAlarmRecordsMapper.java | 2 +- .../xzzn/ems/mapper/EmsAmmeterDataMapper.java | 2 +- .../ems/mapper/EmsBatteryClusterMapper.java | 4 +- .../xzzn/ems/mapper/EmsBatteryDataMapper.java | 4 +- .../ems/mapper/EmsBatteryStackMapper.java | 2 +- .../xzzn/ems/mapper/EmsCoolingDataMapper.java | 2 +- .../ems/mapper/EmsDevicesSettingMapper.java | 6 +- .../ems/mapper/EmsPcsBranchDataMapper.java | 6 +- .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 10 +- .../xzzn/ems/mapper/EmsSiteSettingMapper.java | 7 + .../com/xzzn/ems/service/IEmsSiteService.java | 4 +- .../xzzn/ems/service/IHomePageService.java | 2 +- .../xzzn/ems/service/ISingleSiteService.java | 18 +- .../ems/service/impl/EmsSiteServiceImpl.java | 4 +- .../ems/service/impl/HomePageServiceImpl.java | 18 +- .../service/impl/SingleSiteServiceImpl.java | 57 +- .../mapper/ems/EmsAlarmRecordsMapper.xml | 12 +- .../mapper/ems/EmsAmmeterDataMapper.xml | 21 +- .../mapper/ems/EmsBatteryClusterMapper.xml | 179 +++++- .../mapper/ems/EmsBatteryDataMapper.xml | 20 +- .../mapper/ems/EmsBatteryStackMapper.xml | 174 +++++- .../mapper/ems/EmsCoolingDataMapper.xml | 14 +- .../mapper/ems/EmsDevicesSettingMapper.xml | 27 +- .../mapper/ems/EmsPcsBranchDataMapper.xml | 112 +++- .../resources/mapper/ems/EmsPcsDataMapper.xml | 79 ++- .../mapper/ems/EmsSiteSettingMapper.xml | 14 +- 50 files changed, 2142 insertions(+), 336 deletions(-) delete mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java rename ems-system/src/main/java/com/xzzn/ems/domain/vo/{SiteMonitorRuningHeadInfoVo.java => SiteMonitorRunningHeadInfoVo.java} (97%) diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java index 4c39286..072d081 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java @@ -26,7 +26,7 @@ public class EmsSiteMapController extends BaseController{ * 获取某个站点基本信息 */ @GetMapping("/getSingleSiteBaseInfo") - public AjaxResult getSingleSiteBaseInfo(@RequestParam Long siteId) + public AjaxResult getSingleSiteBaseInfo(@RequestParam String siteId) { return success(homePageService.getSingleSiteBaseInfo(siteId)); } 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 91fbdd1..f462657 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 @@ -25,7 +25,7 @@ public class EmsSiteMonitorController extends BaseController{ * 获取单站首页数据 */ @GetMapping("/homeView") - public AjaxResult getSingleSiteViewInfo(@RequestParam Long siteId) + public AjaxResult getSingleSiteViewInfo(@RequestParam String siteId) { return success(iSingleSiteService.getSiteMonitorDataVo(siteId)); } @@ -34,7 +34,7 @@ public class EmsSiteMonitorController extends BaseController{ * 单站监控-设备监控-实时运行头部数据 */ @GetMapping("/runningHeadInfo") - public AjaxResult getRunningHeadInfo(@RequestParam Long siteId) + public AjaxResult getRunningHeadInfo(@RequestParam String siteId) { return success(iSingleSiteService.getSiteRunningHeadInfo(siteId)); } @@ -43,7 +43,7 @@ public class EmsSiteMonitorController extends BaseController{ * 单站监控-设备监控-实时运行曲线图数据 */ @GetMapping("/runningGraph") - public AjaxResult getRunningGraph(@RequestParam Long siteId) + public AjaxResult getRunningGraph(@RequestParam String siteId) { return success(iSingleSiteService.getRunningGraph(siteId)); } @@ -52,7 +52,7 @@ public class EmsSiteMonitorController extends BaseController{ * 单站监控-设备监控-PCS */ @GetMapping("/getPcsDetailInfo") - public AjaxResult getPcsDetailInfo(@RequestParam Long siteId) + public AjaxResult getPcsDetailInfo(@RequestParam String siteId) { return success(iSingleSiteService.getPcsDetailInfo(siteId)); } @@ -61,7 +61,7 @@ public class EmsSiteMonitorController extends BaseController{ * 单站监控-设备监控-BMS总览 */ @GetMapping("/getBMSOverView") - public AjaxResult getBMSOverView(@RequestParam Long siteId) + public AjaxResult getBMSOverView(@RequestParam String siteId) { return success(iSingleSiteService.getBMSOverView(siteId)); } @@ -70,7 +70,7 @@ public class EmsSiteMonitorController extends BaseController{ * 单站监控-设备监控-BMS电池簇 */ @GetMapping("/getBMSBatteryCluster") - public AjaxResult getBMSBatteryCluster(@RequestParam Long siteId) + public AjaxResult getBMSBatteryCluster(@RequestParam String siteId) { return success(iSingleSiteService.getBMSBatteryCluster(siteId)); } @@ -79,7 +79,7 @@ public class EmsSiteMonitorController extends BaseController{ * 获取所有电池堆 */ @GetMapping("/getStackNameList") - public AjaxResult getStackNameList(@RequestParam Long siteId) + public AjaxResult getStackNameList(@RequestParam String siteId) { return success(iEmsSiteService.getAllStackInfo(siteId)); } @@ -88,7 +88,7 @@ public class EmsSiteMonitorController extends BaseController{ * 获取所有电池簇 */ @GetMapping("/getClusterNameList") - public AjaxResult getClusterNameList(@RequestParam Long stackDeviceId) + public AjaxResult getClusterNameList(@RequestParam String stackDeviceId) { return success(iEmsSiteService.getAllClusterInfo(stackDeviceId)); } @@ -97,7 +97,7 @@ public class EmsSiteMonitorController extends BaseController{ * 液冷设备参数 */ @GetMapping("/getCoolingDataList") - public AjaxResult getCoolingDataList(@RequestParam Long siteId) + public AjaxResult getCoolingDataList(@RequestParam String siteId) { return success(iSingleSiteService.getCoolingDataList(siteId)); } @@ -106,7 +106,7 @@ public class EmsSiteMonitorController extends BaseController{ * 获取电池簇下面的单体电池数据 */ @GetMapping("/getClusterDataInfoList") - public AjaxResult getClusterDataInfoList(@RequestParam Long clusterDeviceId) + public AjaxResult getClusterDataInfoList(@RequestParam String clusterDeviceId) { return success(iSingleSiteService.getClusterDataInfoList(clusterDeviceId)); } @@ -115,7 +115,7 @@ public class EmsSiteMonitorController extends BaseController{ * 电表数据 */ @GetMapping("/getAmmeterDataList") - public AjaxResult getAmmeterDataList(@RequestParam Long siteId) + public AjaxResult getAmmeterDataList(@RequestParam String siteId) { return success(iSingleSiteService.getAmmeterDataList(siteId)); } diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java index 4baff1c..292aac9 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java @@ -169,8 +169,8 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { data.setDataTimestamp(new Date()); // ID字段 - data.setSiteId(Long.parseLong("021")); - data.setClusterDeviceId(Long.parseLong("021")); + data.setSiteId(("021")); + data.setClusterDeviceId(("021")); emsBatteryDataService.insertEmsBatteryData(data); @@ -230,7 +230,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber { // data.setUpdateBy(BigDecimal.ZERO); // data.setUpdateTime(BigDecimal.ZERO); // data.setRemark(BigDecimal.ZERO); - data.setSiteId(Long.parseLong("021")); + data.setSiteId(("021")); data.setDeviceId(deviceId); data.setDateMonth(Long.parseLong("6")); data.setDateDay(Long.parseLong("28")); diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java index f9a673b..fe5cb52 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java @@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel; * 告警记录对象 ems_alarm_records * * @author xzzn - * @date 2025-06-17 + * @date 2025-06-29 */ public class EmsAlarmRecords extends BaseEntity { @@ -48,11 +48,11 @@ public class EmsAlarmRecords extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; /** 设备名称，用于标识设备 */ @Excel(name = "设备名称，用于标识设备") @@ -128,22 +128,22 @@ public class EmsAlarmRecords extends BaseEntity return status; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java index a110ce9..7509603 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java @@ -12,13 +12,13 @@ import com.xzzn.common.annotation.Excel; * 总数据对象 ems_ammeter_data * * @author xzzn - * @date 2025-06-27 + * @date 2025-06-29 */ public class EmsAmmeterData extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** */ private Long id; /** 数据更新时间 */ @@ -34,6 +34,10 @@ public class EmsAmmeterData extends BaseEntity @Excel(name = "总 (kWh)") private BigDecimal totalKwh; + /** 尖 (kWh) */ + @Excel(name = "尖 (kWh)") + private BigDecimal sharpKwh; + /** 峰 (kWh) */ @Excel(name = "峰 (kWh)") private BigDecimal peakKwh; @@ -48,11 +52,11 @@ public class EmsAmmeterData extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; public void setId(Long id) { @@ -94,6 +98,16 @@ public class EmsAmmeterData extends BaseEntity return totalKwh; } + public void setSharpKwh(BigDecimal sharpKwh) + { + this.sharpKwh = sharpKwh; + } + + public BigDecimal getSharpKwh() + { + return sharpKwh; + } + public void setPeakKwh(BigDecimal peakKwh) { this.peakKwh = peakKwh; @@ -124,22 +138,22 @@ public class EmsAmmeterData extends BaseEntity return valleyKwh; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } @@ -151,6 +165,7 @@ public class EmsAmmeterData extends BaseEntity .append("dataUpdateTime", getDataUpdateTime()) .append("category", getCategory()) .append("totalKwh", getTotalKwh()) + .append("sharpKwh", getSharpKwh()) .append("peakKwh", getPeakKwh()) .append("flatKwh", getFlatKwh()) .append("valleyKwh", getValleyKwh()) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java index e19045d..05718b5 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java @@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel; * 电池簇数据对象 ems_battery_cluster * * @author xzzn - * @date 2025-06-22 + * @date 2025-06-29 */ public class EmsBatteryCluster extends BaseEntity { @@ -74,11 +74,143 @@ public class EmsBatteryCluster extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; + + /** 堆设备id */ + @Excel(name = "堆设备id") + private String stackDeviceId; + + /** 允许充电最大功率 */ + @Excel(name = "允许充电最大功率") + private BigDecimal maxAllowedChargePower; + + /** 允许放电最大功率 */ + @Excel(name = "允许放电最大功率") + private BigDecimal maxAllowedDischargePower; + + /** 允许充电最大电压 */ + @Excel(name = "允许充电最大电压") + private BigDecimal maxAllowedChargeVoltage; + + /** 允许放电最大电压 */ + @Excel(name = "允许放电最大电压") + private BigDecimal maxAllowedDischargeVoltage; + + /** 允许充电最大电流 */ + @Excel(name = "允许充电最大电流") + private BigDecimal maxAllowedChargeCurrent; + + /** 允许放电最大电流 */ + @Excel(name = "允许放电最大电流") + private BigDecimal maxAllowedDischargeCurrent; + + /** 组电压 */ + @Excel(name = "组电压") + private BigDecimal batteryPackVoltage; + + /** 组电流 */ + @Excel(name = "组电流") + private BigDecimal batteryPackCurrent; + + /** 模块温度 */ + @Excel(name = "模块温度") + private BigDecimal batteryPackTemp; + + /** 组SOC */ + @Excel(name = "组SOC") + private BigDecimal batteryPackSoc; + + /** 组SOH */ + @Excel(name = "组SOH") + private BigDecimal batteryPackSoh; + + /** 组绝缘电阻 */ + @Excel(name = "组绝缘电阻") + private BigDecimal batteryPackInsulationResistance; + + /** 平均单体电压 */ + @Excel(name = "平均单体电压") + private BigDecimal avgCellVoltage; + + /** 平均单体温度 */ + @Excel(name = "平均单体温度") + private BigDecimal avgCellTemp; + + /** 最高单体电压 */ + @Excel(name = "最高单体电压") + private BigDecimal maxCellVoltage; + + /** 最高单体电压对应点号 */ + @Excel(name = "最高单体电压对应点号") + private Long maxCellVoltageId; + + /** 最低单体电压 */ + @Excel(name = "最低单体电压") + private BigDecimal minCellVoltage; + + /** 最低单体电压对应点号 */ + @Excel(name = "最低单体电压对应点号") + private Long minCellVoltageId; + + /** 最高单体温度 */ + @Excel(name = "最高单体温度") + private BigDecimal maxCellTemp; + + /** 最高单体温度对应点号 */ + @Excel(name = "最高单体温度对应点号") + private Long maxCellTempId; + + /** 最低单体温度 */ + @Excel(name = "最低单体温度") + private BigDecimal minCellTemp; + + /** 最低单体温度对应点号 */ + @Excel(name = "最低单体温度对应点号") + private Long minCellTempId; + + /** 最高单体SOC */ + @Excel(name = "最高单体SOC") + private BigDecimal maxCellSoc; + + /** 最高单体SOC对应点号 */ + @Excel(name = "最高单体SOC对应点号") + private Long maxCellSocId; + + /** 最低单体SOC */ + @Excel(name = "最低单体SOC") + private BigDecimal minCellSoc; + + /** 最低单体SOC对应点号 */ + @Excel(name = "最低单体SOC对应点号") + private Long minCellSocId; + + /** 最高单体SOH */ + @Excel(name = "最高单体SOH") + private BigDecimal maxCellSoh; + + /** 最高单体SOH对应点号 */ + @Excel(name = "最高单体SOH对应点号") + private Long maxCellSohId; + + /** 最低单体SOH */ + @Excel(name = "最低单体SOH") + private BigDecimal minCellSoh; + + /** 最低单体SOH对应点号 */ + @Excel(name = "最低单体SOH对应点号") + private Long minCellSohId; + + /** 单次累计充电电量 */ + @Excel(name = "单次累计充电电量") + private BigDecimal totalChargeEnergy; + + /** 单次累计放电电量 */ + @Excel(name = "单次累计放电电量") + private BigDecimal totalDischargeEnergy; public void setId(Long id) { @@ -220,26 +352,356 @@ public class EmsBatteryCluster extends BaseEntity return currentSoc; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } + public void setStackDeviceId(String stackDeviceId) + { + this.stackDeviceId = stackDeviceId; + } + + public String getStackDeviceId() + { + return stackDeviceId; + } + + public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower) + { + this.maxAllowedChargePower = maxAllowedChargePower; + } + + public BigDecimal getMaxAllowedChargePower() + { + return maxAllowedChargePower; + } + + public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower) + { + this.maxAllowedDischargePower = maxAllowedDischargePower; + } + + public BigDecimal getMaxAllowedDischargePower() + { + return maxAllowedDischargePower; + } + + public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage) + { + this.maxAllowedChargeVoltage = maxAllowedChargeVoltage; + } + + public BigDecimal getMaxAllowedChargeVoltage() + { + return maxAllowedChargeVoltage; + } + + public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage) + { + this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage; + } + + public BigDecimal getMaxAllowedDischargeVoltage() + { + return maxAllowedDischargeVoltage; + } + + public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent) + { + this.maxAllowedChargeCurrent = maxAllowedChargeCurrent; + } + + public BigDecimal getMaxAllowedChargeCurrent() + { + return maxAllowedChargeCurrent; + } + + public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent) + { + this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent; + } + + public BigDecimal getMaxAllowedDischargeCurrent() + { + return maxAllowedDischargeCurrent; + } + + public void setBatteryPackVoltage(BigDecimal batteryPackVoltage) + { + this.batteryPackVoltage = batteryPackVoltage; + } + + public BigDecimal getBatteryPackVoltage() + { + return batteryPackVoltage; + } + + public void setBatteryPackCurrent(BigDecimal batteryPackCurrent) + { + this.batteryPackCurrent = batteryPackCurrent; + } + + public BigDecimal getBatteryPackCurrent() + { + return batteryPackCurrent; + } + + public void setBatteryPackTemp(BigDecimal batteryPackTemp) + { + this.batteryPackTemp = batteryPackTemp; + } + + public BigDecimal getBatteryPackTemp() + { + return batteryPackTemp; + } + + public void setBatteryPackSoc(BigDecimal batteryPackSoc) + { + this.batteryPackSoc = batteryPackSoc; + } + + public BigDecimal getBatteryPackSoc() + { + return batteryPackSoc; + } + + public void setBatteryPackSoh(BigDecimal batteryPackSoh) + { + this.batteryPackSoh = batteryPackSoh; + } + + public BigDecimal getBatteryPackSoh() + { + return batteryPackSoh; + } + + public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance) + { + this.batteryPackInsulationResistance = batteryPackInsulationResistance; + } + + public BigDecimal getBatteryPackInsulationResistance() + { + return batteryPackInsulationResistance; + } + + public void setAvgCellVoltage(BigDecimal avgCellVoltage) + { + this.avgCellVoltage = avgCellVoltage; + } + + public BigDecimal getAvgCellVoltage() + { + return avgCellVoltage; + } + + public void setAvgCellTemp(BigDecimal avgCellTemp) + { + this.avgCellTemp = avgCellTemp; + } + + public BigDecimal getAvgCellTemp() + { + return avgCellTemp; + } + + public void setMaxCellVoltage(BigDecimal maxCellVoltage) + { + this.maxCellVoltage = maxCellVoltage; + } + + public BigDecimal getMaxCellVoltage() + { + return maxCellVoltage; + } + + public void setMaxCellVoltageId(Long maxCellVoltageId) + { + this.maxCellVoltageId = maxCellVoltageId; + } + + public Long getMaxCellVoltageId() + { + return maxCellVoltageId; + } + + public void setMinCellVoltage(BigDecimal minCellVoltage) + { + this.minCellVoltage = minCellVoltage; + } + + public BigDecimal getMinCellVoltage() + { + return minCellVoltage; + } + + public void setMinCellVoltageId(Long minCellVoltageId) + { + this.minCellVoltageId = minCellVoltageId; + } + + public Long getMinCellVoltageId() + { + return minCellVoltageId; + } + + public void setMaxCellTemp(BigDecimal maxCellTemp) + { + this.maxCellTemp = maxCellTemp; + } + + public BigDecimal getMaxCellTemp() + { + return maxCellTemp; + } + + public void setMaxCellTempId(Long maxCellTempId) + { + this.maxCellTempId = maxCellTempId; + } + + public Long getMaxCellTempId() + { + return maxCellTempId; + } + + public void setMinCellTemp(BigDecimal minCellTemp) + { + this.minCellTemp = minCellTemp; + } + + public BigDecimal getMinCellTemp() + { + return minCellTemp; + } + + public void setMinCellTempId(Long minCellTempId) + { + this.minCellTempId = minCellTempId; + } + + public Long getMinCellTempId() + { + return minCellTempId; + } + + public void setMaxCellSoc(BigDecimal maxCellSoc) + { + this.maxCellSoc = maxCellSoc; + } + + public BigDecimal getMaxCellSoc() + { + return maxCellSoc; + } + + public void setMaxCellSocId(Long maxCellSocId) + { + this.maxCellSocId = maxCellSocId; + } + + public Long getMaxCellSocId() + { + return maxCellSocId; + } + + public void setMinCellSoc(BigDecimal minCellSoc) + { + this.minCellSoc = minCellSoc; + } + + public BigDecimal getMinCellSoc() + { + return minCellSoc; + } + + public void setMinCellSocId(Long minCellSocId) + { + this.minCellSocId = minCellSocId; + } + + public Long getMinCellSocId() + { + return minCellSocId; + } + + public void setMaxCellSoh(BigDecimal maxCellSoh) + { + this.maxCellSoh = maxCellSoh; + } + + public BigDecimal getMaxCellSoh() + { + return maxCellSoh; + } + + public void setMaxCellSohId(Long maxCellSohId) + { + this.maxCellSohId = maxCellSohId; + } + + public Long getMaxCellSohId() + { + return maxCellSohId; + } + + public void setMinCellSoh(BigDecimal minCellSoh) + { + this.minCellSoh = minCellSoh; + } + + public BigDecimal getMinCellSoh() + { + return minCellSoh; + } + + public void setMinCellSohId(Long minCellSohId) + { + this.minCellSohId = minCellSohId; + } + + public Long getMinCellSohId() + { + return minCellSohId; + } + + public void setTotalChargeEnergy(BigDecimal totalChargeEnergy) + { + this.totalChargeEnergy = totalChargeEnergy; + } + + public BigDecimal getTotalChargeEnergy() + { + return totalChargeEnergy; + } + + public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy) + { + this.totalDischargeEnergy = totalDischargeEnergy; + } + + public BigDecimal getTotalDischargeEnergy() + { + return totalDischargeEnergy; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -264,6 +726,39 @@ public class EmsBatteryCluster extends BaseEntity .append("remark", getRemark()) .append("siteId", getSiteId()) .append("deviceId", getDeviceId()) + .append("stackDeviceId", getStackDeviceId()) + .append("maxAllowedChargePower", getMaxAllowedChargePower()) + .append("maxAllowedDischargePower", getMaxAllowedDischargePower()) + .append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage()) + .append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage()) + .append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent()) + .append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent()) + .append("batteryPackVoltage", getBatteryPackVoltage()) + .append("batteryPackCurrent", getBatteryPackCurrent()) + .append("batteryPackTemp", getBatteryPackTemp()) + .append("batteryPackSoc", getBatteryPackSoc()) + .append("batteryPackSoh", getBatteryPackSoh()) + .append("batteryPackInsulationResistance", getBatteryPackInsulationResistance()) + .append("avgCellVoltage", getAvgCellVoltage()) + .append("avgCellTemp", getAvgCellTemp()) + .append("maxCellVoltage", getMaxCellVoltage()) + .append("maxCellVoltageId", getMaxCellVoltageId()) + .append("minCellVoltage", getMinCellVoltage()) + .append("minCellVoltageId", getMinCellVoltageId()) + .append("maxCellTemp", getMaxCellTemp()) + .append("maxCellTempId", getMaxCellTempId()) + .append("minCellTemp", getMinCellTemp()) + .append("minCellTempId", getMinCellTempId()) + .append("maxCellSoc", getMaxCellSoc()) + .append("maxCellSocId", getMaxCellSocId()) + .append("minCellSoc", getMinCellSoc()) + .append("minCellSocId", getMinCellSocId()) + .append("maxCellSoh", getMaxCellSoh()) + .append("maxCellSohId", getMaxCellSohId()) + .append("minCellSoh", getMinCellSoh()) + .append("minCellSohId", getMinCellSohId()) + .append("totalChargeEnergy", getTotalChargeEnergy()) + .append("totalDischargeEnergy", getTotalDischargeEnergy()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java index 1847431..799b413 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java @@ -12,13 +12,13 @@ import com.xzzn.common.annotation.Excel; * 单体电池实时数据对象 ems_battery_data * * @author xzzn - * @date 2025-06-28 + * @date 2025-06-29 */ public class EmsBatteryData extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** */ private Long id; /** 电池堆 */ @@ -56,7 +56,7 @@ public class EmsBatteryData extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") @@ -64,7 +64,7 @@ public class EmsBatteryData extends BaseEntity /** 簇设备id */ @Excel(name = "簇设备id") - private Long clusterDeviceId; + private String clusterDeviceId; public void setId(Long id) { @@ -156,12 +156,12 @@ public class EmsBatteryData extends BaseEntity return dataTimestamp; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } @@ -176,12 +176,12 @@ public class EmsBatteryData extends BaseEntity return deviceId; } - public void setClusterDeviceId(Long clusterDeviceId) + public void setClusterDeviceId(String clusterDeviceId) { this.clusterDeviceId = clusterDeviceId; } - public Long getClusterDeviceId() + public String getClusterDeviceId() { return clusterDeviceId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java index 30bc120..82409b9 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java @@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel; * 电池堆数据对象 ems_battery_stack * * @author xzzn - * @date 2025-06-22 + * @date 2025-06-29 */ public class EmsBatteryStack extends BaseEntity { @@ -74,11 +74,139 @@ public class EmsBatteryStack extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; + + /** 允许充电最大功率 */ + @Excel(name = "允许充电最大功率") + private BigDecimal maxAllowedChargePower; + + /** 允许放电最大功率 */ + @Excel(name = "允许放电最大功率") + private BigDecimal maxAllowedDischargePower; + + /** 允许充电最大电压 */ + @Excel(name = "允许充电最大电压") + private BigDecimal maxAllowedChargeVoltage; + + /** 允许放电最大电压 */ + @Excel(name = "允许放电最大电压") + private BigDecimal maxAllowedDischargeVoltage; + + /** 允许充电最大电流 */ + @Excel(name = "允许充电最大电流") + private BigDecimal maxAllowedChargeCurrent; + + /** 允许放电最大电流 */ + @Excel(name = "允许放电最大电流") + private BigDecimal maxAllowedDischargeCurrent; + + /** 组电压 */ + @Excel(name = "组电压") + private BigDecimal batteryPackVoltage; + + /** 组电流 */ + @Excel(name = "组电流") + private BigDecimal batteryPackCurrent; + + /** 模块温度 */ + @Excel(name = "模块温度") + private BigDecimal batteryPackTemp; + + /** 组SOC */ + @Excel(name = "组SOC") + private BigDecimal batteryPackSoc; + + /** 组SOH */ + @Excel(name = "组SOH") + private BigDecimal batteryPackSoh; + + /** 组绝缘电阻 */ + @Excel(name = "组绝缘电阻") + private BigDecimal batteryPackInsulationResistance; + + /** 平均单体电压 */ + @Excel(name = "平均单体电压") + private BigDecimal avgCellVoltage; + + /** 平均单体温度 */ + @Excel(name = "平均单体温度") + private BigDecimal avgCellTemp; + + /** 最高单体电压 */ + @Excel(name = "最高单体电压") + private BigDecimal maxCellVoltage; + + /** 最高单体电压对应点号 */ + @Excel(name = "最高单体电压对应点号") + private Long maxCellVoltageId; + + /** 最低单体电压 */ + @Excel(name = "最低单体电压") + private BigDecimal minCellVoltage; + + /** 最低单体电压对应点号 */ + @Excel(name = "最低单体电压对应点号") + private Long minCellVoltageId; + + /** 最高单体温度 */ + @Excel(name = "最高单体温度") + private BigDecimal maxCellTemp; + + /** 最高单体温度对应点号 */ + @Excel(name = "最高单体温度对应点号") + private Long maxCellTempId; + + /** 最低单体温度 */ + @Excel(name = "最低单体温度") + private BigDecimal minCellTemp; + + /** 最低单体温度对应点号 */ + @Excel(name = "最低单体温度对应点号") + private Long minCellTempId; + + /** 最高单体SOC */ + @Excel(name = "最高单体SOC") + private BigDecimal maxCellSoc; + + /** 最高单体SOC对应点号 */ + @Excel(name = "最高单体SOC对应点号") + private Long maxCellSocId; + + /** 最低单体SOC */ + @Excel(name = "最低单体SOC") + private BigDecimal minCellSoc; + + /** 最低单体SOC对应点号 */ + @Excel(name = "最低单体SOC对应点号") + private Long minCellSocId; + + /** 最高单体SOH */ + @Excel(name = "最高单体SOH") + private BigDecimal maxCellSoh; + + /** 最高单体SOH对应点号 */ + @Excel(name = "最高单体SOH对应点号") + private Long maxCellSohId; + + /** 最低单体SOH */ + @Excel(name = "最低单体SOH") + private BigDecimal minCellSoh; + + /** 最低单体SOH对应点号 */ + @Excel(name = "最低单体SOH对应点号") + private Long minCellSohId; + + /** 单次累计充电电量 */ + @Excel(name = "单次累计充电电量") + private BigDecimal totalChargeEnergy; + + /** 单次累计放电电量 */ + @Excel(name = "单次累计放电电量") + private BigDecimal totalDischargeEnergy; public void setId(Long id) { @@ -220,26 +348,346 @@ public class EmsBatteryStack extends BaseEntity return currentSoc; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } + public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower) + { + this.maxAllowedChargePower = maxAllowedChargePower; + } + + public BigDecimal getMaxAllowedChargePower() + { + return maxAllowedChargePower; + } + + public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower) + { + this.maxAllowedDischargePower = maxAllowedDischargePower; + } + + public BigDecimal getMaxAllowedDischargePower() + { + return maxAllowedDischargePower; + } + + public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage) + { + this.maxAllowedChargeVoltage = maxAllowedChargeVoltage; + } + + public BigDecimal getMaxAllowedChargeVoltage() + { + return maxAllowedChargeVoltage; + } + + public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage) + { + this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage; + } + + public BigDecimal getMaxAllowedDischargeVoltage() + { + return maxAllowedDischargeVoltage; + } + + public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent) + { + this.maxAllowedChargeCurrent = maxAllowedChargeCurrent; + } + + public BigDecimal getMaxAllowedChargeCurrent() + { + return maxAllowedChargeCurrent; + } + + public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent) + { + this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent; + } + + public BigDecimal getMaxAllowedDischargeCurrent() + { + return maxAllowedDischargeCurrent; + } + + public void setBatteryPackVoltage(BigDecimal batteryPackVoltage) + { + this.batteryPackVoltage = batteryPackVoltage; + } + + public BigDecimal getBatteryPackVoltage() + { + return batteryPackVoltage; + } + + public void setBatteryPackCurrent(BigDecimal batteryPackCurrent) + { + this.batteryPackCurrent = batteryPackCurrent; + } + + public BigDecimal getBatteryPackCurrent() + { + return batteryPackCurrent; + } + + public void setBatteryPackTemp(BigDecimal batteryPackTemp) + { + this.batteryPackTemp = batteryPackTemp; + } + + public BigDecimal getBatteryPackTemp() + { + return batteryPackTemp; + } + + public void setBatteryPackSoc(BigDecimal batteryPackSoc) + { + this.batteryPackSoc = batteryPackSoc; + } + + public BigDecimal getBatteryPackSoc() + { + return batteryPackSoc; + } + + public void setBatteryPackSoh(BigDecimal batteryPackSoh) + { + this.batteryPackSoh = batteryPackSoh; + } + + public BigDecimal getBatteryPackSoh() + { + return batteryPackSoh; + } + + public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance) + { + this.batteryPackInsulationResistance = batteryPackInsulationResistance; + } + + public BigDecimal getBatteryPackInsulationResistance() + { + return batteryPackInsulationResistance; + } + + public void setAvgCellVoltage(BigDecimal avgCellVoltage) + { + this.avgCellVoltage = avgCellVoltage; + } + + public BigDecimal getAvgCellVoltage() + { + return avgCellVoltage; + } + + public void setAvgCellTemp(BigDecimal avgCellTemp) + { + this.avgCellTemp = avgCellTemp; + } + + public BigDecimal getAvgCellTemp() + { + return avgCellTemp; + } + + public void setMaxCellVoltage(BigDecimal maxCellVoltage) + { + this.maxCellVoltage = maxCellVoltage; + } + + public BigDecimal getMaxCellVoltage() + { + return maxCellVoltage; + } + + public void setMaxCellVoltageId(Long maxCellVoltageId) + { + this.maxCellVoltageId = maxCellVoltageId; + } + + public Long getMaxCellVoltageId() + { + return maxCellVoltageId; + } + + public void setMinCellVoltage(BigDecimal minCellVoltage) + { + this.minCellVoltage = minCellVoltage; + } + + public BigDecimal getMinCellVoltage() + { + return minCellVoltage; + } + + public void setMinCellVoltageId(Long minCellVoltageId) + { + this.minCellVoltageId = minCellVoltageId; + } + + public Long getMinCellVoltageId() + { + return minCellVoltageId; + } + + public void setMaxCellTemp(BigDecimal maxCellTemp) + { + this.maxCellTemp = maxCellTemp; + } + + public BigDecimal getMaxCellTemp() + { + return maxCellTemp; + } + + public void setMaxCellTempId(Long maxCellTempId) + { + this.maxCellTempId = maxCellTempId; + } + + public Long getMaxCellTempId() + { + return maxCellTempId; + } + + public void setMinCellTemp(BigDecimal minCellTemp) + { + this.minCellTemp = minCellTemp; + } + + public BigDecimal getMinCellTemp() + { + return minCellTemp; + } + + public void setMinCellTempId(Long minCellTempId) + { + this.minCellTempId = minCellTempId; + } + + public Long getMinCellTempId() + { + return minCellTempId; + } + + public void setMaxCellSoc(BigDecimal maxCellSoc) + { + this.maxCellSoc = maxCellSoc; + } + + public BigDecimal getMaxCellSoc() + { + return maxCellSoc; + } + + public void setMaxCellSocId(Long maxCellSocId) + { + this.maxCellSocId = maxCellSocId; + } + + public Long getMaxCellSocId() + { + return maxCellSocId; + } + + public void setMinCellSoc(BigDecimal minCellSoc) + { + this.minCellSoc = minCellSoc; + } + + public BigDecimal getMinCellSoc() + { + return minCellSoc; + } + + public void setMinCellSocId(Long minCellSocId) + { + this.minCellSocId = minCellSocId; + } + + public Long getMinCellSocId() + { + return minCellSocId; + } + + public void setMaxCellSoh(BigDecimal maxCellSoh) + { + this.maxCellSoh = maxCellSoh; + } + + public BigDecimal getMaxCellSoh() + { + return maxCellSoh; + } + + public void setMaxCellSohId(Long maxCellSohId) + { + this.maxCellSohId = maxCellSohId; + } + + public Long getMaxCellSohId() + { + return maxCellSohId; + } + + public void setMinCellSoh(BigDecimal minCellSoh) + { + this.minCellSoh = minCellSoh; + } + + public BigDecimal getMinCellSoh() + { + return minCellSoh; + } + + public void setMinCellSohId(Long minCellSohId) + { + this.minCellSohId = minCellSohId; + } + + public Long getMinCellSohId() + { + return minCellSohId; + } + + public void setTotalChargeEnergy(BigDecimal totalChargeEnergy) + { + this.totalChargeEnergy = totalChargeEnergy; + } + + public BigDecimal getTotalChargeEnergy() + { + return totalChargeEnergy; + } + + public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy) + { + this.totalDischargeEnergy = totalDischargeEnergy; + } + + public BigDecimal getTotalDischargeEnergy() + { + return totalDischargeEnergy; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -264,6 +712,38 @@ public class EmsBatteryStack extends BaseEntity .append("remark", getRemark()) .append("siteId", getSiteId()) .append("deviceId", getDeviceId()) + .append("maxAllowedChargePower", getMaxAllowedChargePower()) + .append("maxAllowedDischargePower", getMaxAllowedDischargePower()) + .append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage()) + .append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage()) + .append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent()) + .append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent()) + .append("batteryPackVoltage", getBatteryPackVoltage()) + .append("batteryPackCurrent", getBatteryPackCurrent()) + .append("batteryPackTemp", getBatteryPackTemp()) + .append("batteryPackSoc", getBatteryPackSoc()) + .append("batteryPackSoh", getBatteryPackSoh()) + .append("batteryPackInsulationResistance", getBatteryPackInsulationResistance()) + .append("avgCellVoltage", getAvgCellVoltage()) + .append("avgCellTemp", getAvgCellTemp()) + .append("maxCellVoltage", getMaxCellVoltage()) + .append("maxCellVoltageId", getMaxCellVoltageId()) + .append("minCellVoltage", getMinCellVoltage()) + .append("minCellVoltageId", getMinCellVoltageId()) + .append("maxCellTemp", getMaxCellTemp()) + .append("maxCellTempId", getMaxCellTempId()) + .append("minCellTemp", getMinCellTemp()) + .append("minCellTempId", getMinCellTempId()) + .append("maxCellSoc", getMaxCellSoc()) + .append("maxCellSocId", getMaxCellSocId()) + .append("minCellSoc", getMinCellSoc()) + .append("minCellSocId", getMinCellSocId()) + .append("maxCellSoh", getMaxCellSoh()) + .append("maxCellSohId", getMaxCellSohId()) + .append("minCellSoh", getMinCellSoh()) + .append("minCellSohId", getMinCellSohId()) + .append("totalChargeEnergy", getTotalChargeEnergy()) + .append("totalDischargeEnergy", getTotalDischargeEnergy()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java index 1a782f0..a469528 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java @@ -11,13 +11,13 @@ import com.xzzn.common.annotation.Excel; * 冷却系统参数对象 ems_cooling_data * * @author xzzn - * @date 2025-06-25 + * @date 2025-06-29 */ public class EmsCoolingData extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** */ private Long id; /** 系统名称，如1#液冷 */ @@ -58,11 +58,11 @@ public class EmsCoolingData extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; public void setId(Long id) { @@ -164,22 +164,22 @@ public class EmsCoolingData extends BaseEntity return lowTempAlarmPoint; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java index de71eee..ea9c3c2 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java @@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel; * Modbus设备配置对象 ems_devices_setting * * @author xzzn - * @date 2025-06-24 + * @date 2025-06-29 */ public class EmsDevicesSetting extends BaseEntity { @@ -84,12 +84,16 @@ public class EmsDevicesSetting extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 通信状态 */ @Excel(name = "通信状态") private String communicationStatus; + /** 设备唯一标识符 */ + @Excel(name = "设备唯一标识符") + private String deviceId; + public void setId(Long id) { this.id = id; @@ -250,12 +254,12 @@ public class EmsDevicesSetting extends BaseEntity return updatedAt; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } @@ -270,6 +274,16 @@ public class EmsDevicesSetting extends BaseEntity return communicationStatus; } + public void setDeviceId(String deviceId) + { + this.deviceId = deviceId; + } + + public String getDeviceId() + { + return deviceId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -291,6 +305,7 @@ public class EmsDevicesSetting extends BaseEntity .append("updatedAt", getUpdatedAt()) .append("siteId", getSiteId()) .append("communicationStatus", getCommunicationStatus()) + .append("deviceId", getDeviceId()) .toString(); } } 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 index 7fefdcc..f981197 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java @@ -11,13 +11,13 @@ import com.xzzn.common.annotation.Excel; * pcs支路数据对象 ems_pcs_branch_data * * @author xzzn - * @date 2025-06-24 + * @date 2025-06-29 */ public class EmsPcsBranchData extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** */ private Long id; /** 放电状态 */ @@ -38,16 +38,96 @@ public class EmsPcsBranchData extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") - private Long deviceId; + private String deviceId; /** 支路id */ @Excel(name = "支路id") private Long branchId; + /** 电网U相电压 */ + @Excel(name = "电网U相电压") + private BigDecimal gridUVoltage; + + /** 电网V相电压 */ + @Excel(name = "电网V相电压") + private BigDecimal gridVVoltage; + + /** 电网W相电压 */ + @Excel(name = "电网W相电压") + private BigDecimal gridWVoltage; + + /** 输出U相电流 */ + @Excel(name = "输出U相电流") + private BigDecimal outputUCurrent; + + /** 输出V相电流 */ + @Excel(name = "输出V相电流") + private BigDecimal outputVCurrent; + + /** 输出W相电流 */ + @Excel(name = "输出W相电流") + private BigDecimal outputWCurrent; + + /** 视在功率 */ + @Excel(name = "视在功率") + private BigDecimal apparentPower; + + /** 有功功率 */ + @Excel(name = "有功功率") + private BigDecimal activePower; + + /** 无功功率 */ + @Excel(name = "无功功率") + private BigDecimal reactivePower; + + /** 功率因数 */ + @Excel(name = "功率因数") + private BigDecimal powerFactor; + + /** 频率 */ + @Excel(name = "频率") + private BigDecimal frequency; + + /** 内部温度 */ + @Excel(name = "内部温度") + private BigDecimal internalTemp; + + /** U相IGBT温度 */ + @Excel(name = "U相IGBT温度") + private BigDecimal uIgbtTemp; + + /** V相IGBT温度 */ + @Excel(name = "V相IGBT温度") + private BigDecimal vIgbtTemp; + + /** W相IGBT温度 */ + @Excel(name = "W相IGBT温度") + private BigDecimal wIgbtTemp; + + /** 并离网状态 */ + @Excel(name = "并离网状态") + private String gridStatus; + + /** 可用功率 */ + @Excel(name = "可用功率") + private BigDecimal availablePower; + + /** 总负载比 */ + @Excel(name = "总负载比") + private BigDecimal totalLoadRatio; + + /** 交流漏电流 */ + @Excel(name = "交流漏电流") + private BigDecimal acLeakageCurrent; + + /** 绝缘阻抗 */ + @Excel(name = "绝缘阻抗") + private BigDecimal insulationResistance; + public void setId(Long id) { this.id = id; @@ -98,22 +178,22 @@ public class EmsPcsBranchData extends BaseEntity return dcCurrent; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public String getDeviceId() { return deviceId; } @@ -128,6 +208,206 @@ public class EmsPcsBranchData extends BaseEntity return branchId; } + public void setGridUVoltage(BigDecimal gridUVoltage) + { + this.gridUVoltage = gridUVoltage; + } + + public BigDecimal getGridUVoltage() + { + return gridUVoltage; + } + + public void setGridVVoltage(BigDecimal gridVVoltage) + { + this.gridVVoltage = gridVVoltage; + } + + public BigDecimal getGridVVoltage() + { + return gridVVoltage; + } + + public void setGridWVoltage(BigDecimal gridWVoltage) + { + this.gridWVoltage = gridWVoltage; + } + + public BigDecimal getGridWVoltage() + { + return gridWVoltage; + } + + public void setOutputUCurrent(BigDecimal outputUCurrent) + { + this.outputUCurrent = outputUCurrent; + } + + public BigDecimal getOutputUCurrent() + { + return outputUCurrent; + } + + public void setOutputVCurrent(BigDecimal outputVCurrent) + { + this.outputVCurrent = outputVCurrent; + } + + public BigDecimal getOutputVCurrent() + { + return outputVCurrent; + } + + public void setOutputWCurrent(BigDecimal outputWCurrent) + { + this.outputWCurrent = outputWCurrent; + } + + public BigDecimal getOutputWCurrent() + { + return outputWCurrent; + } + + public void setApparentPower(BigDecimal apparentPower) + { + this.apparentPower = apparentPower; + } + + public BigDecimal getApparentPower() + { + return apparentPower; + } + + public void setActivePower(BigDecimal activePower) + { + this.activePower = activePower; + } + + public BigDecimal getActivePower() + { + return activePower; + } + + public void setReactivePower(BigDecimal reactivePower) + { + this.reactivePower = reactivePower; + } + + public BigDecimal getReactivePower() + { + return reactivePower; + } + + public void setPowerFactor(BigDecimal powerFactor) + { + this.powerFactor = powerFactor; + } + + public BigDecimal getPowerFactor() + { + return powerFactor; + } + + public void setFrequency(BigDecimal frequency) + { + this.frequency = frequency; + } + + public BigDecimal getFrequency() + { + return frequency; + } + + public void setInternalTemp(BigDecimal internalTemp) + { + this.internalTemp = internalTemp; + } + + public BigDecimal getInternalTemp() + { + return internalTemp; + } + + public void setuIgbtTemp(BigDecimal uIgbtTemp) + { + this.uIgbtTemp = uIgbtTemp; + } + + public BigDecimal getuIgbtTemp() + { + return uIgbtTemp; + } + + public void setvIgbtTemp(BigDecimal vIgbtTemp) + { + this.vIgbtTemp = vIgbtTemp; + } + + public BigDecimal getvIgbtTemp() + { + return vIgbtTemp; + } + + public void setwIgbtTemp(BigDecimal wIgbtTemp) + { + this.wIgbtTemp = wIgbtTemp; + } + + public BigDecimal getwIgbtTemp() + { + return wIgbtTemp; + } + + public void setGridStatus(String gridStatus) + { + this.gridStatus = gridStatus; + } + + public String getGridStatus() + { + return gridStatus; + } + + public void setAvailablePower(BigDecimal availablePower) + { + this.availablePower = availablePower; + } + + public BigDecimal getAvailablePower() + { + return availablePower; + } + + public void setTotalLoadRatio(BigDecimal totalLoadRatio) + { + this.totalLoadRatio = totalLoadRatio; + } + + public BigDecimal getTotalLoadRatio() + { + return totalLoadRatio; + } + + public void setAcLeakageCurrent(BigDecimal acLeakageCurrent) + { + this.acLeakageCurrent = acLeakageCurrent; + } + + public BigDecimal getAcLeakageCurrent() + { + return acLeakageCurrent; + } + + public void setInsulationResistance(BigDecimal insulationResistance) + { + this.insulationResistance = insulationResistance; + } + + public BigDecimal getInsulationResistance() + { + return insulationResistance; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -144,6 +424,26 @@ public class EmsPcsBranchData extends BaseEntity .append("siteId", getSiteId()) .append("deviceId", getDeviceId()) .append("branchId", getBranchId()) + .append("gridUVoltage", getGridUVoltage()) + .append("gridVVoltage", getGridVVoltage()) + .append("gridWVoltage", getGridWVoltage()) + .append("outputUCurrent", getOutputUCurrent()) + .append("outputVCurrent", getOutputVCurrent()) + .append("outputWCurrent", getOutputWCurrent()) + .append("apparentPower", getApparentPower()) + .append("activePower", getActivePower()) + .append("reactivePower", getReactivePower()) + .append("powerFactor", getPowerFactor()) + .append("frequency", getFrequency()) + .append("internalTemp", getInternalTemp()) + .append("uIgbtTemp", getuIgbtTemp()) + .append("vIgbtTemp", getvIgbtTemp()) + .append("wIgbtTemp", getwIgbtTemp()) + .append("gridStatus", getGridStatus()) + .append("availablePower", getAvailablePower()) + .append("totalLoadRatio", getTotalLoadRatio()) + .append("acLeakageCurrent", getAcLeakageCurrent()) + .append("insulationResistance", getInsulationResistance()) .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 1864b04..079294f 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java @@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel; * PCS数据对象 ems_pcs_data * * @author xzzn - * @date 2025-06-28 + * @date 2025-06-29 */ public class EmsPcsData extends BaseEntity { @@ -124,7 +124,7 @@ public class EmsPcsData extends BaseEntity /** 站点id */ @Excel(name = "站点id") - private Long siteId; + private String siteId; /** 设备唯一标识符 */ @Excel(name = "设备唯一标识符") @@ -450,12 +450,12 @@ public class EmsPcsData extends BaseEntity return dcCurrent; } - public void setSiteId(Long siteId) + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getSiteId() + public String getSiteId() { return siteId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java index 6143a21..d70f537 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java @@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel; * 站点对象 ems_site_setting * * @author xzzn - * @date 2025-06-20 + * @date 2025-06-29 */ public class EmsSiteSetting extends BaseEntity { @@ -50,6 +50,10 @@ public class EmsSiteSetting extends BaseEntity @Excel(name = "装机功率") private BigDecimal installPower; + /** 站点id */ + @Excel(name = "站点id") + private String siteId; + public void setId(Long id) { this.id = id; @@ -130,6 +134,16 @@ public class EmsSiteSetting extends BaseEntity return installPower; } + public void setSiteId(String siteId) + { + this.siteId = siteId; + } + + public String getSiteId() + { + return siteId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -146,6 +160,7 @@ public class EmsSiteSetting extends BaseEntity .append("updateBy", getUpdateBy()) .append("createTime", getCreateTime()) .append("updateTime", getUpdateTime()) + .append("siteId", getSiteId()) .toString(); } -} \ No newline at end of file +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterDataDetailInfo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterDataDetailInfo.java index 6f15ca1..6dfdff3 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterDataDetailInfo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterDataDetailInfo.java @@ -27,7 +27,7 @@ public class AmmeterDataDetailInfo private BigDecimal valleyKwh; /** 总表设备Id */ - private Long deviceId; + private String deviceId; /** 数据更新时间 */ private Date updateTime; @@ -80,11 +80,11 @@ public class AmmeterDataDetailInfo this.category = category; } - public Long getDeviceId() { + public String getDeviceId() { return deviceId; } - public void setDeviceId(Long deviceId) { + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterDataList.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterDataList.java index edeb022..a03e286 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterDataList.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterDataList.java @@ -18,13 +18,13 @@ public class BMSBatteryClusterDataList { private BigDecimal minData; /** 单体最小值ID */ - private Long minDataID; + private String minDataID; /** 单体最大值 */ private BigDecimal maxData; /** 单体最大值ID */ - private Long maxDataID; + private String maxDataID; public String getDataName() { return dataName; @@ -50,11 +50,11 @@ public class BMSBatteryClusterDataList { this.minData = minData; } - public Long getMinDataID() { + public String getMinDataID() { return minDataID; } - public void setMinDataID(Long minDataID) { + public void setMinDataID(String minDataID) { this.minDataID = minDataID; } @@ -66,11 +66,11 @@ public class BMSBatteryClusterDataList { this.maxData = maxData; } - public Long getMaxDataID() { + public String getMaxDataID() { return maxDataID; } - public void setMaxDataID(Long maxDataID) { + public void setMaxDataID(String maxDataID) { this.maxDataID = maxDataID; } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java index f576b6b..8de0dda 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java @@ -52,10 +52,10 @@ public class BMSBatteryClusterVo { private BigDecimal currentSoc; /** 站点id */ - private Long siteId; + private String siteId; /** 设备唯一标识符 */ - private Long deviceId; + private String deviceId; private List batteryDataList; @@ -171,19 +171,19 @@ public class BMSBatteryClusterVo { this.currentSoc = currentSoc; } - public Long getSiteId() { + public String getSiteId() { return siteId; } - public void setSiteId(Long siteId) { + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getDeviceId() { + public String getDeviceId() { return deviceId; } - public void setDeviceId(Long deviceId) { + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryDataList.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryDataList.java index 1ef444c..394c921 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryDataList.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryDataList.java @@ -33,10 +33,10 @@ public class BMSBatteryDataList { private BigDecimal minTemperature; /** 换电站id */ - private Long siteId; + private String siteId; /** 堆id */ - private Long stackDeviceId; + private String stackDeviceId; public Long getClusterId() { return clusterId; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java index e5b2a43..d209cd7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java @@ -52,10 +52,10 @@ public class BMSOverViewVo { private BigDecimal currentSoc; /** 站点id */ - private Long siteId; + private String siteId; /** 设备唯一标识符 */ - private Long deviceId; + private String deviceId; private List batteryDataList; @@ -171,19 +171,19 @@ public class BMSOverViewVo { this.currentSoc = currentSoc; } - public Long getDeviceId() { + public String getDeviceId() { return deviceId; } - public void setDeviceId(Long deviceId) { + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getSiteId() { + public String getSiteId() { return siteId; } - public void setSiteId(Long siteId) { + public void setSiteId(String siteId) { this.siteId = siteId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryClusterDataDetailVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryClusterDataDetailVo.java index 45e40e1..3cf27ed 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryClusterDataDetailVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryClusterDataDetailVo.java @@ -8,10 +8,10 @@ import java.math.BigDecimal; public class BatteryClusterDataDetailVo { /** 设备id */ - private Long siteId; + private String siteId; /** 电池簇id */ - private Long clusterId; + private String clusterId; /** 电压平均值 */ private BigDecimal avgVoltage; @@ -40,19 +40,19 @@ public class BatteryClusterDataDetailVo { /** soc最小值 */ private BigDecimal minSoc; - public Long getSiteId() { + public String getSiteId() { return siteId; } - public void setSiteId(Long siteId) { + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getClusterId() { + public String getClusterId() { return clusterId; } - public void setClusterId(Long clusterId) { + public void setClusterId(String clusterId) { this.clusterId = clusterId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java index 7990385..f71e713 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java @@ -1,61 +1,65 @@ package com.xzzn.ems.domain.vo; -import java.util.List; + +import java.math.BigDecimal; /** * 单站监控-单体电池数据 * */ public class BatteryDataStatsListVo { - /** - * 电压List - */ - private List voltageDataList; + /** 月份 */ + private String dataMonth; - /** - * 温度List - */ - private List tempDataList; + /** 电压 (V) */ + private BigDecimal voltage; - /** - * SOCList - */ - private List socDataList; + /** 温度 (℃) */ + private BigDecimal temperature; - /** - * SOHList - */ - private List sohDataList; + /** SOC (%) */ + private BigDecimal soc; - public List getVoltageDataList() { - return voltageDataList; + /** SOH (%) */ + private BigDecimal soh; + + public String getDataMonth() { + return dataMonth; } - public void setVoltageDataList(List voltageDataList) { - this.voltageDataList = voltageDataList; + public void setDataMonth(String dataMonth) { + this.dataMonth = dataMonth; } - public List getTempDataList() { - return tempDataList; + public BigDecimal getVoltage() { + return voltage; } - public void setTempDataList(List tempDataList) { - this.tempDataList = tempDataList; + public void setVoltage(BigDecimal voltage) { + this.voltage = voltage; } - public List getSocDataList() { - return socDataList; + public BigDecimal getTemperature() { + return temperature; } - public void setSocDataList(List socDataList) { - this.socDataList = socDataList; + public void setTemperature(BigDecimal temperature) { + this.temperature = temperature; } - public List getSohDataList() { - return sohDataList; + public BigDecimal getSoc() { + return soc; } - public void setSohDataList(List sohDataList) { - this.sohDataList = sohDataList; + public void setSoc(BigDecimal soc) { + this.soc = soc; + } + + public BigDecimal getSoh() { + return soh; + } + + public void setSoh(BigDecimal soh) { + this.soh = soh; } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java deleted file mode 100644 index 2c4a21d..0000000 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.xzzn.ems.domain.vo; - -import java.math.BigDecimal; - -/** - * 单体电池-数据统计模板 - * - */ -public class BatteryDataStatsTemplate { - /** - * 月份 - */ - private String dataMonth; - - /** - * 数据一 - */ - private BigDecimal dataOne; - - /** - * 数据二 - */ - private BigDecimal dataTwo; - - public String getDataMonth() { - return dataMonth; - } - - public void setDataMonth(String dataMonth) { - this.dataMonth = dataMonth; - } - - public BigDecimal getDataOne() { - return dataOne; - } - - public void setDataOne(BigDecimal dataOne) { - this.dataOne = dataOne; - } - - public BigDecimal getDataTwo() { - return dataTwo; - } - - public void setDataTwo(BigDecimal dataTwo) { - this.dataTwo = dataTwo; - } -} 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 index 6b61911..4b0d923 100644 --- 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 @@ -25,10 +25,10 @@ public class PcsBranchInfo private BigDecimal dcCurrent; /** 站点id */ - private Long siteId; + private String siteId; /** 设备唯一标识符 */ - private Long deviceId; + private String deviceId; /** 支路id */ private Long branchId; @@ -65,19 +65,19 @@ public class PcsBranchInfo this.dcCurrent = dcCurrent; } - public Long getSiteId() { + public String getSiteId() { return siteId; } - public void setSiteId(Long siteId) { + public void setSiteId(String siteId) { this.siteId = siteId; } - public Long getDeviceId() { + public String getDeviceId() { return deviceId; } - public void setDeviceId(Long deviceId) { + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } 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 index 1fa77c1..5187f7b 100644 --- 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 @@ -81,29 +81,29 @@ public class PcsDetailInfoVo { private BigDecimal acFrequency; /** 站点id */ - private Long siteId; + private String siteId; /** 设备唯一标识符 */ - private Long deviceId; + private String deviceId; /** 设备名称 */ private String deviceName; private List pcsBranchInfoList; - public Long getDeviceId() { + public String getDeviceId() { return deviceId; } - public void setDeviceId(Long deviceId) { + public void setDeviceId(String deviceId) { this.deviceId = deviceId; } - public Long getSiteId() { + public String getSiteId() { return siteId; } - public void setSiteId(Long siteId) { + public void setSiteId(String siteId) { this.siteId = siteId; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningHeadInfoVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRunningHeadInfoVo.java similarity index 97% rename from ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningHeadInfoVo.java rename to ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRunningHeadInfoVo.java index 1e87d0f..50583fe 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningHeadInfoVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRunningHeadInfoVo.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; * 单站监控-设备监控-实时运行头部行数据 * */ -public class SiteMonitorRuningHeadInfoVo { +public class SiteMonitorRunningHeadInfoVo { /** * 实时有功功率 */ diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java index d7592c4..0127cc6 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java @@ -66,7 +66,7 @@ public interface EmsAlarmRecordsMapper * 根据站点id获取告警记录 * */ - public List getAlarmRecordsBySiteId(Long siteId); + public List getAlarmRecordsBySiteId(String siteId); /** * 获取告警趋势数据 diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAmmeterDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAmmeterDataMapper.java index 2cf34aa..7c1d4e6 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAmmeterDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsAmmeterDataMapper.java @@ -65,5 +65,5 @@ public interface EmsAmmeterDataMapper * @param siteId * @return */ - public List getAmmeterDetailInfo(Long siteId); + public List getAmmeterDetailInfo(String siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryClusterMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryClusterMapper.java index f98b7ce..8502f5e 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryClusterMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryClusterMapper.java @@ -67,7 +67,7 @@ public interface EmsBatteryClusterMapper * @param siteId * @return */ - public List getBMSBatteryCluster(Long siteId); + public List getBMSBatteryCluster(String siteId); /** * 根据site_di和堆id获取簇数据和单体数据 @@ -75,5 +75,5 @@ public interface EmsBatteryClusterMapper * @param stackDeviceId * @return */ - public List getBmsBatteryData(@Param("siteId")Long siteId, @Param("stackDeviceId")Long stackDeviceId); + public List getBmsBatteryData(@Param("siteId")String siteId, @Param("stackDeviceId")String stackDeviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java index 7862183..cdaa2b4 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java @@ -70,7 +70,7 @@ public interface EmsBatteryDataMapper * @param siteId * @return */ - public EmsBatteryData getBatteryDataBySiteId(Long siteId); + public EmsBatteryData getBatteryDataBySiteId(String siteId); /** * 根据siteId和簇id获取单体数据 @@ -78,7 +78,7 @@ public interface EmsBatteryDataMapper * @param clusterDeviceId * @return */ - public BatteryClusterDataDetailVo getBatteryDataByClusterId(@Param("siteId")Long siteId, @Param("clusterDeviceId")Long clusterDeviceId); + public BatteryClusterDataDetailVo getBatteryDataByClusterId(@Param("siteId")String siteId, @Param("clusterDeviceId")String clusterDeviceId); /** * 获取最大最小的单体id diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryStackMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryStackMapper.java index e1b8155..7347fc6 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryStackMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryStackMapper.java @@ -65,5 +65,5 @@ public interface EmsBatteryStackMapper * @param siteId * @return */ - public List selectEmsBatteryStackBySiteId(Long siteId); + public List selectEmsBatteryStackBySiteId(String siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsCoolingDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsCoolingDataMapper.java index e1bc42f..4b4d984 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsCoolingDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsCoolingDataMapper.java @@ -64,5 +64,5 @@ public interface EmsCoolingDataMapper * @param siteId * @return */ - public List getCoolingDataList(Long siteId); + public List getCoolingDataList(String siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java index 8002a45..a565438 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java @@ -66,19 +66,19 @@ public interface EmsDevicesSettingMapper * @param siteId * @return */ - public List> getAllStackInfoBySiteId(Long siteId); + public List> getAllStackInfoBySiteId(String siteId); /** * 根据电池堆id获取所有电池簇 * @param stackDeviceId * @return */ - public List> getAllClusterInfoByStackId(Long stackDeviceId); + public List> getAllClusterInfoByStackId(String stackDeviceId); /** * 获取设备通信状态 * @param deviceId * @return */ - public Map getDeviceStatus(Long deviceId); + public Map getDeviceStatus(String deviceId); } 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 index 80baed6..96cc5ff 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java @@ -3,13 +3,13 @@ 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; +import io.lettuce.core.dynamic.annotation.Param; /** * pcs支路数据Mapper接口 * * @author xzzn - * @date 2025-06-24 + * @date 2025-06-29 */ public interface EmsPcsBranchDataMapper { @@ -67,5 +67,5 @@ public interface EmsPcsBranchDataMapper * @param deviceId * @return */ - public List getPcsBranchInfoList(@Param("siteId")Long siteId, @Param("deviceId")Long deviceId); + public List getPcsBranchInfoList(@Param("siteId")String siteId, @Param("deviceId")String 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 55dd7b5..a0f7a00 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 @@ -8,7 +8,7 @@ import com.xzzn.ems.domain.EmsPcsData; import com.xzzn.ems.domain.vo.ElectricIndexList; import com.xzzn.ems.domain.vo.PcsDetailInfoVo; import com.xzzn.ems.domain.vo.SiteMonitorDataVo; -import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo; +import com.xzzn.ems.domain.vo.SiteMonitorRunningHeadInfoVo; /** * PCS数据Mapper接口 @@ -71,21 +71,21 @@ public interface EmsPcsDataMapper * @param siteId * @return */ - public List getPcsDataBySiteId(Long siteId); + public List getPcsDataBySiteId(String siteId); /** * 根据站点获取电网实时功率=sum（总交流有功电率） * @param siteId * @return */ - public BigDecimal getGridNrtPower(Long siteId); + public BigDecimal getGridNrtPower(String siteId); /** * 根据站点获取设备监控的实时运行头信息 * @param siteId * @return */ - public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId); + public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId); /** * 获取每月的充电量和放电量 @@ -98,7 +98,7 @@ public interface EmsPcsDataMapper * @param siteId * @return */ - public List getPcsDetailInfoBySiteId(Long siteId); + public List getPcsDetailInfoBySiteId(String siteId); /** * 获取总充+总放 diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java index 807a767..152726c 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java @@ -65,4 +65,11 @@ public interface EmsSiteSettingMapper * @return */ public SiteTotalInfoVo getSiteTotalInfo(); + + /** + * 根据站点id获取站点信息 + * @param siteId + * @return + */ + public EmsSiteSetting selectEmsSiteSettingBySiteId(String siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java index 8bdd27b..ef3ee31 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java @@ -18,9 +18,9 @@ public interface IEmsSiteService public SiteTotalInfoVo getSiteTotalInfo(); - public List> getAllStackInfo(Long siteId); + public List> getAllStackInfo(String siteId); - public List> getAllClusterInfo(Long stackDeviceId); + public List> getAllClusterInfo(String stackDeviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IHomePageService.java b/ems-system/src/main/java/com/xzzn/ems/service/IHomePageService.java index 81ba148..25823ce 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IHomePageService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IHomePageService.java @@ -13,7 +13,7 @@ public interface IHomePageService public SiteTotalInfoVo getSiteTotalInfo(); - public SingleSiteBaseInfo getSingleSiteBaseInfo(Long siteId); + public SingleSiteBaseInfo getSingleSiteBaseInfo(String siteId); public HomePageDataViewVo getHomePageDataList(); } 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 a871b3e..7154a5e 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 @@ -12,22 +12,22 @@ import java.util.List; public interface ISingleSiteService { - public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId); + public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId); - public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId); + public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId); - public SiteMonitorRuningInfoVo getRunningGraph(Long siteId); + public SiteMonitorRuningInfoVo getRunningGraph(String siteId); - public List getPcsDetailInfo(Long siteId); + public List getPcsDetailInfo(String siteId); - public List getBMSOverView(Long siteId); + public List getBMSOverView(String siteId); - public List getBMSBatteryCluster(Long siteId); + public List getBMSBatteryCluster(String siteId); - public List getCoolingDataList(Long siteId); + public List getCoolingDataList(String siteId); - public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId); + public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId); - public List getAmmeterDataList(Long siteId); + public List getAmmeterDataList(String siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java index 98a2282..1519a79 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java @@ -40,7 +40,7 @@ public class EmsSiteServiceImpl implements IEmsSiteService * @return */ @Override - public List> getAllStackInfo(Long siteId) { + public List> getAllStackInfo(String siteId) { return emsDevicesMapper.getAllStackInfoBySiteId(siteId); } @@ -50,7 +50,7 @@ public class EmsSiteServiceImpl implements IEmsSiteService * @return */ @Override - public List> getAllClusterInfo(Long stackDeviceId) { + public List> getAllClusterInfo(String stackDeviceId) { return emsDevicesMapper.getAllClusterInfoByStackId(stackDeviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java index b563b98..be5a4dc 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java @@ -46,12 +46,12 @@ public class HomePageServiceImpl implements IHomePageService // 单站点基本信息 @Override - public SingleSiteBaseInfo getSingleSiteBaseInfo(Long siteId) { + public SingleSiteBaseInfo getSingleSiteBaseInfo(String siteId) { SingleSiteBaseInfo singleSiteBaseInfo = new SingleSiteBaseInfo(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { // 站点基本信息 - EmsSiteSetting emsSite = emsSiteMapper.selectEmsSiteSettingById(siteId); + EmsSiteSetting emsSite = emsSiteMapper.selectEmsSiteSettingBySiteId(siteId); if (emsSite != null) { // 装机功率+装机容量 singleSiteBaseInfo.setSiteName(emsSite.getSiteName()); @@ -62,7 +62,8 @@ public class HomePageServiceImpl implements IHomePageService siteLocation[1] = emsSite.getLatitude() == null ? "" : emsSite.getLatitude().toString(); singleSiteBaseInfo.setSiteLocation(siteLocation);//站点位置 singleSiteBaseInfo.setSiteAddress(emsSite.getSiteAddress()); - singleSiteBaseInfo.setRunningTime(DateUtils.parseDateToStr("yyyy-MM-dd",emsSite.getRunningTime()));//投运时间 + singleSiteBaseInfo.setRunningTime(emsSite.getRunningTime() == null ? null : + DateUtils.parseDateToStr("yyyy-MM-dd",emsSite.getRunningTime()));//投运时间 // 七天放电数据统计 List siteMonitorDataVoList = emsPcsDataMapper.getPcsDataBySiteId(siteId); singleSiteBaseInfo.setSevenDayDisChargeStats(siteMonitorDataVoList); @@ -122,17 +123,14 @@ public class HomePageServiceImpl implements IHomePageService public HomePageDataViewVo getHomePageDataList() { HomePageDataViewVo homePageDataViewVo = new HomePageDataViewVo(); // 电量指标 - List electricDataList = new ArrayList(); - electricDataList = emsPcsDataMapper.getElectDataList(); + List electricDataList = emsPcsDataMapper.getElectDataList(); homePageDataViewVo.setElecDataList(electricDataList); // 系统效率 // 告警趋势 - List alarmTrendList = new ArrayList(); - alarmTrendList = alarmRecordsMapper.getAlarmTrendList(); + List alarmTrendList = alarmRecordsMapper.getAlarmTrendList(); homePageDataViewVo.setAlarmDataList(alarmTrendList); // 设备告警占比 - List deviceAlarmPropList = new ArrayList(); - deviceAlarmPropList = alarmRecordsMapper.getDeviceAlarmPropList(); + List deviceAlarmPropList = alarmRecordsMapper.getDeviceAlarmPropList(); homePageDataViewVo.setDeviceAlarmList(deviceAlarmPropList); // 告警等级分布 return homePageDataViewVo; 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 9c9fd63..2c2c4f6 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 @@ -46,10 +46,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService { private EmsDevicesSettingMapper emsDevicesSettingMapper; @Override - public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId) { + public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId) { SiteMonitorHomeVo siteMonitorHomeVo = new SiteMonitorHomeVo(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { // 实时告警数据 名称+状态+告警内容 List siteMonitorHomeAlarmVo = emsAlarmRecordsMapper.getAlarmRecordsBySiteId(siteId); siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo); @@ -106,10 +106,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 获取单站监控实时运行头部数据 @Override - public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId) { - SiteMonitorRuningHeadInfoVo siteMonitorRunningHeadInfoVo = new SiteMonitorRuningHeadInfoVo(); + public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId) { + SiteMonitorRunningHeadInfoVo siteMonitorRunningHeadInfoVo = new SiteMonitorRunningHeadInfoVo(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { // 实时有功功率/实时无功功率/今日充电量/今日放电量 siteMonitorRunningHeadInfoVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId); // 电池簇SOC @@ -126,9 +126,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 获取单站监控实时运行曲线图数据 @Override - public SiteMonitorRuningInfoVo getRunningGraph(Long siteId) { + public SiteMonitorRuningInfoVo getRunningGraph(String siteId) { SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { //储能功率list //pcs平均温度list //电池平均soclist @@ -139,17 +139,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 根据site_id获取pcs详细数据+支路数据 @Override - public List getPcsDetailInfo(Long siteId) { + public List getPcsDetailInfo(String siteId) { List pcsDetailInfoVoList = new ArrayList<>(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { // 获取pcs最新数据 pcsDetailInfoVoList = emsPcsDataMapper.getPcsDetailInfoBySiteId(siteId); if (!CollectionUtils.isEmpty(pcsDetailInfoVoList)) { for (PcsDetailInfoVo pcsDetailInfoVo : pcsDetailInfoVoList) { - Long deviceId = pcsDetailInfoVo.getDeviceId(); + String deviceId = pcsDetailInfoVo.getDeviceId(); // 获取支路最新数据 - if (deviceId != null) { + if (!StringUtils.isEmpty(deviceId)) { List pcsBranchInfoList = emsPcsBranchDataMapper.getPcsBranchInfoList(siteId, deviceId); pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList); } @@ -161,17 +161,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 获取BMS总览数据 @Override - public List getBMSOverView(Long siteId) { + public List getBMSOverView(String siteId) { List bmsOverViewVoList = new ArrayList<>(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { // 获取电池堆list bmsOverViewVoList = emsBatteryStackMapper.selectEmsBatteryStackBySiteId(siteId); if (!CollectionUtils.isEmpty(bmsOverViewVoList)) { for (BMSOverViewVo bmsOverViewVo : bmsOverViewVoList) { // 获取单体电池数据-待确认 - Long stackDeviceId = bmsOverViewVo.getDeviceId(); - if (stackDeviceId != null) { + String stackDeviceId = bmsOverViewVo.getDeviceId(); + if (!StringUtils.isEmpty(stackDeviceId)) { List batteryDataList = new ArrayList<>(); batteryDataList = emsBatteryClusterMapper.getBmsBatteryData(siteId,stackDeviceId); bmsOverViewVo.setBatteryDataList(batteryDataList); @@ -184,17 +184,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 获取BMS电池簇数据 @Override - public List getBMSBatteryCluster(Long siteId) { + public List getBMSBatteryCluster(String siteId) { List bmsBatteryClusterVoList = new ArrayList<>(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { bmsBatteryClusterVoList = emsBatteryClusterMapper.getBMSBatteryCluster(siteId); if (!CollectionUtils.isEmpty(bmsBatteryClusterVoList)) { for (BMSBatteryClusterVo bmsBatteryClusterVo : bmsBatteryClusterVoList) { - Long clusterDeviceId = bmsBatteryClusterVo.getDeviceId(); + String clusterDeviceId = bmsBatteryClusterVo.getDeviceId(); List clusterDataList = new ArrayList<>(); - if (clusterDeviceId != null) { + if (!StringUtils.isEmpty(clusterDeviceId)) { // 获取单体电池数据-平均/最大/最小 BatteryClusterDataDetailVo batteryClusterDataDetailVo = emsBatteryDataMapper.getBatteryDataByClusterId(siteId,clusterDeviceId); // 处理数据 @@ -218,14 +218,14 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 设置对应单体id List> dataIdMapList = emsBatteryDataMapper.getDataIdsMap(batteryClusterDataDetailVo); - Map resultIdMap = new HashMap<>(); + Map resultIdMap = new HashMap<>(); if (!CollectionUtils.isEmpty(dataIdMapList)) { resultIdMap = dataIdMapList.stream() .filter(map -> map.containsKey("type") && map.containsKey("device_id")) // 过滤无效数据 .filter(map -> map.get("type") instanceof String && map.get("device_id") instanceof Number) // 确保类型正确 .collect(Collectors.toMap( map -> (String) map.get("type"), // 键：type 字段 - map -> ((Number) map.get("device_id")).longValue(), // 值：device_id 转为 int + map -> (String) map.get("device_id"), // 值：device_id 转为 int (existing, replacement) -> existing // 处理键冲突的策略 )); @@ -253,9 +253,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 获取液冷设备参数 @Override - public List getCoolingDataList(Long siteId) { + public List getCoolingDataList(String siteId) { List emsCoolingDataList = new ArrayList<>(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { emsCoolingDataList = emsCoolingDataMapper.getCoolingDataList(siteId); } return emsCoolingDataList; @@ -268,8 +268,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService { * @return */ @Override - public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId) { - return null; + public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId) { + BatteryDataStatsListVo batteryDataStatsListVo = new BatteryDataStatsListVo(); + return batteryDataStatsListVo; } /** @@ -278,15 +279,15 @@ public class SingleSiteServiceImpl implements ISingleSiteService { * @return */ @Override - public List getAmmeterDataList(Long siteId) { + public List getAmmeterDataList(String siteId) { List ammeterDataVos = new ArrayList<>(); AmmeterDataVo ammeterDataVo = new AmmeterDataVo(); - if (siteId != null) { + if (!StringUtils.isEmpty(siteId)) { List ammeterDataDetailInfos = emsAmmeterDataMapper.getAmmeterDetailInfo(siteId); ammeterDataVo.setAmmeterDataDetailInfos(ammeterDataDetailInfos); if (!CollectionUtils.isEmpty(ammeterDataDetailInfos)) { // 获取通信状态 - Long deviceId = ammeterDataDetailInfos.get(0).getDeviceId(); + String deviceId = ammeterDataDetailInfos.get(0).getDeviceId(); Map map = emsDevicesSettingMapper.getDeviceStatus(deviceId); ammeterDataVo.setEmsCommunicationStatus(map.get("communication_status").toString()); // 数据更新时间 diff --git a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml index 2c92e25..5d7f60d 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml @@ -35,8 +35,8 @@ and alarm_start_time = #{alarmStartTime} and alarm_end_time = #{alarmEndTime} and status = #{status} - and site_id = #{siteId} - and device_id = #{deviceId} + and site_id = #{siteId} + and device_id = #{deviceId} and device_name like concat('%', #{deviceName}, '%') @@ -61,7 +61,7 @@ update_time, remark, site_id, - device_id, + device_id, device_name, @@ -77,7 +77,7 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, #{deviceName}, @@ -97,7 +97,7 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, device_name = #{deviceName}, where id = #{id} @@ -114,7 +114,7 @@ - select device_name as deviceName, status,alarm_content as alarmContent from ems_alarm_records diff --git a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml index 1e91afe..63edc13 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml @@ -9,6 +9,7 @@ + @@ -22,7 +23,7 @@ - select id, data_update_time, category, total_kwh, peak_kwh, flat_kwh, valley_kwh, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_ammeter_data + select id, data_update_time, category, total_kwh, sharp_kwh, peak_kwh, flat_kwh, valley_kwh, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_ammeter_data @@ -50,6 +52,7 @@ data_update_time, category, total_kwh, + sharp_kwh, peak_kwh, flat_kwh, valley_kwh, @@ -59,12 +62,13 @@ update_time, remark, site_id, - device_id, + device_id, #{dataUpdateTime}, #{category}, #{totalKwh}, + #{sharpKwh}, #{peakKwh}, #{flatKwh}, #{valleyKwh}, @@ -74,7 +78,7 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, @@ -84,6 +88,7 @@ data_update_time = #{dataUpdateTime}, category = #{category}, total_kwh = #{totalKwh}, + sharp_kwh = #{sharpKwh}, peak_kwh = #{peakKwh}, flat_kwh = #{flatKwh}, valley_kwh = #{valleyKwh}, @@ -93,7 +98,7 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, where id = #{id} @@ -108,9 +113,11 @@ #{id} - select t.category as category, t.total_kwh as totalKwh, + t.sharp_kwh as sharpKwh, t.flat_kwh as flatKwh, t.peak_kwh as peakKwh, t.valley_kwh as valleyKwh, diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml index bd4f43c..31349cb 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml @@ -26,10 +26,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 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 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 from ems_battery_cluster @@ -80,7 +146,40 @@ update_time, remark, site_id, - device_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, #{workStatus}, @@ -102,7 +201,40 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, + #{stackDeviceId}, + #{maxAllowedChargePower}, + #{maxAllowedDischargePower}, + #{maxAllowedChargeVoltage}, + #{maxAllowedDischargeVoltage}, + #{maxAllowedChargeCurrent}, + #{maxAllowedDischargeCurrent}, + #{batteryPackVoltage}, + #{batteryPackCurrent}, + #{batteryPackTemp}, + #{batteryPackSoc}, + #{batteryPackSoh}, + #{batteryPackInsulationResistance}, + #{avgCellVoltage}, + #{avgCellTemp}, + #{maxCellVoltage}, + #{maxCellVoltageId}, + #{minCellVoltage}, + #{minCellVoltageId}, + #{maxCellTemp}, + #{maxCellTempId}, + #{minCellTemp}, + #{minCellTempId}, + #{maxCellSoc}, + #{maxCellSocId}, + #{minCellSoc}, + #{minCellSocId}, + #{maxCellSoh}, + #{maxCellSohId}, + #{minCellSoh}, + #{minCellSohId}, + #{totalChargeEnergy}, + #{totalDischargeEnergy}, @@ -128,7 +260,40 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, + stack_device_id = #{stackDeviceId}, + max_allowed_charge_power = #{maxAllowedChargePower}, + max_allowed_discharge_power = #{maxAllowedDischargePower}, + max_allowed_charge_voltage = #{maxAllowedChargeVoltage}, + max_allowed_discharge_voltage = #{maxAllowedDischargeVoltage}, + max_allowed_charge_current = #{maxAllowedChargeCurrent}, + max_allowed_discharge_current = #{maxAllowedDischargeCurrent}, + battery_pack_voltage = #{batteryPackVoltage}, + battery_pack_current = #{batteryPackCurrent}, + battery_pack_temp = #{batteryPackTemp}, + battery_pack_soc = #{batteryPackSoc}, + battery_pack_soh = #{batteryPackSoh}, + battery_pack_insulation_resistance = #{batteryPackInsulationResistance}, + avg_cell_voltage = #{avgCellVoltage}, + avg_cell_temp = #{avgCellTemp}, + max_cell_voltage = #{maxCellVoltage}, + max_cell_voltage_id = #{maxCellVoltageId}, + min_cell_voltage = #{minCellVoltage}, + min_cell_voltage_id = #{minCellVoltageId}, + max_cell_temp = #{maxCellTemp}, + max_cell_temp_id = #{maxCellTempId}, + min_cell_temp = #{minCellTemp}, + min_cell_temp_id = #{minCellTempId}, + max_cell_soc = #{maxCellSoc}, + max_cell_soc_id = #{maxCellSocId}, + min_cell_soc = #{minCellSoc}, + min_cell_soc_id = #{minCellSocId}, + max_cell_soh = #{maxCellSoh}, + max_cell_soh_id = #{maxCellSohId}, + min_cell_soh = #{minCellSoh}, + min_cell_soh_id = #{minCellSohId}, + total_charge_energy = #{totalChargeEnergy}, + total_discharge_energy = #{totalDischargeEnergy}, where id = #{id} @@ -144,7 +309,7 @@ - select td.device_name as deviceName, tmp.work_status as workStatus, tmp.pcs_communication_status as pcsCommunicationStatus, tmp.ems_communication_status as emsCommunicationStatus, tmp.cluster_voltage as clusterVoltage,tmp.chargeable_capacity as chargeableCapacity, tmp.total_charged_capacity as totalChargedCapacity, diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml index ad7ab18..d47499c 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml @@ -39,9 +39,9 @@ and soc = #{soc} and soh = #{soh} and data_timestamp = #{dataTimestamp} - and site_id = #{siteId} - and device_id = #{deviceId} - and cluster_device_id = #{clusterDeviceId} + and site_id = #{siteId} + and device_id = #{deviceId} + and cluster_device_id = #{clusterDeviceId} @@ -67,8 +67,8 @@ update_time, remark, site_id, - device_id, - cluster_device_id, + device_id, + cluster_device_id, #{batteryPack}, @@ -85,8 +85,8 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, - #{clusterDeviceId}, + #{deviceId}, + #{clusterDeviceId}, @@ -107,8 +107,8 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, - cluster_device_id = #{clusterDeviceId}, + device_id = #{deviceId}, + cluster_device_id = #{clusterDeviceId}, where id = #{id} @@ -124,7 +124,7 @@ - where site_id = #{siteId} and DATE(data_timestamp) = DATE(NOW()) diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml index 724d750..db08ffb 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml @@ -26,10 +26,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select id, work_status, pcs_communication_status, ems_communication_status, total_voltage, chargeable_capacity, total_charged_capacity, total_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 from ems_battery_stack + select id, work_status, pcs_communication_status, ems_communication_status, total_voltage, chargeable_capacity, total_charged_capacity, total_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, 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_stack @@ -80,7 +144,39 @@ update_time, remark, site_id, - device_id, + 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, #{workStatus}, @@ -102,7 +198,39 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, + #{maxAllowedChargePower}, + #{maxAllowedDischargePower}, + #{maxAllowedChargeVoltage}, + #{maxAllowedDischargeVoltage}, + #{maxAllowedChargeCurrent}, + #{maxAllowedDischargeCurrent}, + #{batteryPackVoltage}, + #{batteryPackCurrent}, + #{batteryPackTemp}, + #{batteryPackSoc}, + #{batteryPackSoh}, + #{batteryPackInsulationResistance}, + #{avgCellVoltage}, + #{avgCellTemp}, + #{maxCellVoltage}, + #{maxCellVoltageId}, + #{minCellVoltage}, + #{minCellVoltageId}, + #{maxCellTemp}, + #{maxCellTempId}, + #{minCellTemp}, + #{minCellTempId}, + #{maxCellSoc}, + #{maxCellSocId}, + #{minCellSoc}, + #{minCellSocId}, + #{maxCellSoh}, + #{maxCellSohId}, + #{minCellSoh}, + #{minCellSohId}, + #{totalChargeEnergy}, + #{totalDischargeEnergy}, @@ -128,7 +256,39 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, + max_allowed_charge_power = #{maxAllowedChargePower}, + max_allowed_discharge_power = #{maxAllowedDischargePower}, + max_allowed_charge_voltage = #{maxAllowedChargeVoltage}, + max_allowed_discharge_voltage = #{maxAllowedDischargeVoltage}, + max_allowed_charge_current = #{maxAllowedChargeCurrent}, + max_allowed_discharge_current = #{maxAllowedDischargeCurrent}, + battery_pack_voltage = #{batteryPackVoltage}, + battery_pack_current = #{batteryPackCurrent}, + battery_pack_temp = #{batteryPackTemp}, + battery_pack_soc = #{batteryPackSoc}, + battery_pack_soh = #{batteryPackSoh}, + battery_pack_insulation_resistance = #{batteryPackInsulationResistance}, + avg_cell_voltage = #{avgCellVoltage}, + avg_cell_temp = #{avgCellTemp}, + max_cell_voltage = #{maxCellVoltage}, + max_cell_voltage_id = #{maxCellVoltageId}, + min_cell_voltage = #{minCellVoltage}, + min_cell_voltage_id = #{minCellVoltageId}, + max_cell_temp = #{maxCellTemp}, + max_cell_temp_id = #{maxCellTempId}, + min_cell_temp = #{minCellTemp}, + min_cell_temp_id = #{minCellTempId}, + max_cell_soc = #{maxCellSoc}, + max_cell_soc_id = #{maxCellSocId}, + min_cell_soc = #{minCellSoc}, + min_cell_soc_id = #{minCellSocId}, + max_cell_soh = #{maxCellSoh}, + max_cell_soh_id = #{maxCellSohId}, + min_cell_soh = #{minCellSoh}, + min_cell_soh_id = #{minCellSohId}, + total_charge_energy = #{totalChargeEnergy}, + total_discharge_energy = #{totalDischargeEnergy}, where id = #{id} @@ -144,7 +304,7 @@ - select td.device_name as deviceName,tmp.work_status as workStatus, tmp.pcs_communication_status as pcsCommunicationStatus,tmp.ems_communication_status as emsCommunicationStatus, tmp.total_voltage as totalVoltage,tmp.chargeable_capacity as chargeableCapacity,tmp.total_charged_capacity as totalChargedCapacity, diff --git a/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml index 89808f1..71ba86c 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsCoolingDataMapper.xml @@ -40,8 +40,8 @@ and heating_stop_point = #{heatingStopPoint} and cooling_stop_point = #{coolingStopPoint} and low_temp_alarm_point = #{lowTempAlarmPoint} - and site_id = #{siteId} - and device_id = #{deviceId} + and site_id = #{siteId} + and device_id = #{deviceId} @@ -68,7 +68,7 @@ update_time, remark, site_id, - device_id, + device_id, #{systemName}, @@ -86,7 +86,7 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, @@ -108,7 +108,7 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, where id = #{id} @@ -124,10 +124,10 @@ - select t.* from ems_cooling_data t - where t.site_id = 1 + where t.site_id = #{siteId} and t.update_time = ( select MAX(tcd.update_time) from ems_cooling_data tcd where tcd.site_id = t.site_id and tcd.device_id = t.device_id) order by t.system_name diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index 39598d2..0df74f0 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -23,10 +23,11 @@ + - select id, device_name, device_type, slave_id, timeout_ms, retries, ip_address, ip_port, serial_port, baud_rate, data_bits, stop_bits, parity, description, created_at, updated_at, site_id, communication_status from ems_devices_setting + select id, device_name, device_type, slave_id, timeout_ms, retries, ip_address, ip_port, serial_port, baud_rate, data_bits, stop_bits, parity, description, created_at, updated_at, site_id, communication_status, device_id from ems_devices_setting @@ -77,6 +79,7 @@ updated_at, site_id, communication_status, + device_id, #{deviceName}, @@ -96,6 +99,7 @@ #{updatedAt}, #{siteId}, #{communicationStatus}, + #{deviceId}, @@ -119,6 +123,7 @@ updated_at = #{updatedAt}, site_id = #{siteId}, communication_status = #{communicationStatus}, + device_id = #{deviceId}, where id = #{id} @@ -134,21 +139,21 @@ - + select device_id as id,device_name as deviceName from ems_devices_setting + where device_id in ( select distinct eb.device_id from ems_battery_stack eb where eb.site_id = #{siteId}) - + select device_id as id,device_name as deviceName from ems_devices_setting - where id in (select distinct eb.device_id from ems_battery_cluster eb where eb.stack_device_id = #{stackDeviceId}) + where device_id in (select distinct eb.device_id from ems_battery_cluster eb where eb.stack_device_id = #{stackDeviceId}) - + select device_id as id,communication_status from ems_devices_setting - where id = #{deviceId} + where device_id = #{deviceId} \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml index 65561e9..9bab5b1 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsBranchDataMapper.xml @@ -18,10 +18,30 @@ + + + + + + + + + + + + + + + + + + + + - 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 + 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, grid_u_voltage, grid_v_voltage, grid_w_voltage, output_u_current, output_v_current, output_w_current, apparent_power, active_power, reactive_power, power_factor, frequency, internal_temp, u_igbt_temp, v_igbt_temp, w_igbt_temp, grid_status, available_power, total_load_ratio, ac_leakage_current, insulation_resistance from ems_pcs_branch_data @@ -55,8 +95,28 @@ update_time, remark, site_id, - device_id, + device_id, branch_id, + grid_u_voltage, + grid_v_voltage, + grid_w_voltage, + output_u_current, + output_v_current, + output_w_current, + apparent_power, + active_power, + reactive_power, + power_factor, + frequency, + internal_temp, + u_igbt_temp, + v_igbt_temp, + w_igbt_temp, + grid_status, + available_power, + total_load_ratio, + ac_leakage_current, + insulation_resistance, #{dischargeStatus}, @@ -69,8 +129,28 @@ #{updateTime}, #{remark}, #{siteId}, - #{deviceId}, + #{deviceId}, #{branchId}, + #{gridUVoltage}, + #{gridVVoltage}, + #{gridWVoltage}, + #{outputUCurrent}, + #{outputVCurrent}, + #{outputWCurrent}, + #{apparentPower}, + #{activePower}, + #{reactivePower}, + #{powerFactor}, + #{frequency}, + #{internalTemp}, + #{uIgbtTemp}, + #{vIgbtTemp}, + #{wIgbtTemp}, + #{gridStatus}, + #{availablePower}, + #{totalLoadRatio}, + #{acLeakageCurrent}, + #{insulationResistance}, @@ -87,8 +167,28 @@ update_time = #{updateTime}, remark = #{remark}, site_id = #{siteId}, - device_id = #{deviceId}, + device_id = #{deviceId}, branch_id = #{branchId}, + grid_u_voltage = #{gridUVoltage}, + grid_v_voltage = #{gridVVoltage}, + grid_w_voltage = #{gridWVoltage}, + output_u_current = #{outputUCurrent}, + output_v_current = #{outputVCurrent}, + output_w_current = #{outputWCurrent}, + apparent_power = #{apparentPower}, + active_power = #{activePower}, + reactive_power = #{reactivePower}, + power_factor = #{powerFactor}, + frequency = #{frequency}, + internal_temp = #{internalTemp}, + u_igbt_temp = #{uIgbtTemp}, + v_igbt_temp = #{vIgbtTemp}, + w_igbt_temp = #{wIgbtTemp}, + grid_status = #{gridStatus}, + available_power = #{availablePower}, + total_load_ratio = #{totalLoadRatio}, + ac_leakage_current = #{acLeakageCurrent}, + insulation_resistance = #{insulationResistance}, where id = #{id} diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index c0f90a7..cd1d7ae 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -87,7 +87,7 @@ and dc_power = #{dcPower} and dc_voltage = #{dcVoltage} and dc_current = #{dcCurrent} - and site_id = #{siteId} + and site_id = #{siteId} and device_id = #{deviceId} and date_month = #{dateMonth} and date_day = #{dateDay} @@ -278,4 +278,81 @@ #{id} + + + + + + + + + + + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml index b10678a..186c39d 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml @@ -18,10 +18,11 @@ + - select id, site_name, site_address, running_time, latitude, longitude, install_capacity, install_power, remark, create_by, update_by, create_time, update_time from ems_site_setting + select id, site_name, site_address, running_time, latitude, longitude, install_capacity, install_power, remark, create_by, update_by, create_time, update_time, site_id from ems_site_setting @@ -57,6 +59,7 @@ update_by, create_time, update_time, + site_id, #{siteName}, @@ -71,6 +74,7 @@ #{updateBy}, #{createTime}, #{updateTime}, + #{siteId}, @@ -89,6 +93,7 @@ update_by = #{updateBy}, create_time = #{createTime}, update_time = #{updateTime}, + site_id = #{siteId}, where id = #{id} @@ -105,9 +110,14 @@ + + \ No newline at end of file