From 102ecbd41cbb60e30a96b5358e4e48cb3230b7d5 Mon Sep 17 00:00:00 2001 From: mashili Date: Thu, 25 Sep 2025 19:44:00 +0800 Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E5=8D=95=E7=AB=99?= =?UTF-8?q?=E7=9B=91=E6=8E=A7-=E5=AE=9E=E6=97=B6=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=9B=B2=E7=BA=BF=E5=9B=BEpcs=E5=88=86=E5=BC=80=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteMonitorController.java | 6 +- .../java/com/xzzn/ems/domain/EmsPcsData.java | 107 ++++++++++++++- .../xzzn/ems/domain/vo/PcsMaxTempList.java | 30 +++++ ...{StackAveTempVo.java => PcsMaxTempVo.java} | 20 ++- .../domain/vo/SiteMonitorRuningInfoVo.java | 10 +- .../ems/mapper/EmsBatteryStackMapper.java | 9 -- .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 5 + .../xzzn/ems/service/ISingleSiteService.java | 2 +- .../impl/DDSDataProcessServiceImpl.java | 6 + .../impl/FXXDataProcessServiceImpl.java | 5 + .../service/impl/SingleSiteServiceImpl.java | 122 +++++++++++++++--- .../resources/mapper/ems/EmsPcsDataMapper.xml | 76 ++++++++++- 12 files changed, 351 insertions(+), 47 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempList.java rename ems-system/src/main/java/com/xzzn/ems/domain/vo/{StackAveTempVo.java => PcsMaxTempVo.java} (52%) 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 578397e..3134973 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 @@ -60,10 +60,10 @@ public class EmsSiteMonitorController extends BaseController{ return success(iSingleSiteService.getRunningGraphStorage(siteId)); } - @GetMapping("/runningGraph/stackAveTemp") - public AjaxResult getRunningGraphStackTemp(@RequestParam String siteId) + @GetMapping("/runningGraph/pcsMaxTemp") + public AjaxResult getRunningGraphPcsMaxTemp(@RequestParam String siteId) { - return success(iSingleSiteService.getRunningGraphStackTemp(siteId)); + return success(iSingleSiteService.getRunningGraphPcsMaxTemp(siteId)); } @GetMapping("/runningGraph/batteryAveSoc") 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 98c642f..b505401 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-07-07 + * @date 2025-09-25 */ public class EmsPcsData extends BaseEntity { @@ -206,6 +206,34 @@ public class EmsPcsData extends BaseEntity @Excel(name = "电网频率") private BigDecimal dwFrequency; + /** 单元1U相IGBT温度 */ + @Excel(name = "单元1U相IGBT温度") + private BigDecimal uTemperature; + + /** 单元1V相IGBT温度 */ + @Excel(name = "单元1V相IGBT温度") + private BigDecimal vTemperature; + + /** 单元1W相IGBT温度 */ + @Excel(name = "单元1W相IGBT温度") + private BigDecimal wTemperature; + + /** 1#模块IGBT最高温 */ + @Excel(name = "1#模块IGBT最高温") + private BigDecimal module1Temp; + + /** 2#模块IGBT最高温 */ + @Excel(name = "2#模块IGBT最高温") + private BigDecimal module2Temp; + + /** 3#模块IGBT最高温 */ + @Excel(name = "3#模块IGBT最高温") + private BigDecimal module3Temp; + + /** 4#模块IGBT最高温 */ + @Excel(name = "4#模块IGBT最高温") + private BigDecimal module4Temp; + public void setId(Long id) { this.id = id; @@ -676,6 +704,76 @@ public class EmsPcsData extends BaseEntity return dwFrequency; } + public void setuTemperature(BigDecimal uTemperature) + { + this.uTemperature = uTemperature; + } + + public BigDecimal getuTemperature() + { + return uTemperature; + } + + public void setvTemperature(BigDecimal vTemperature) + { + this.vTemperature = vTemperature; + } + + public BigDecimal getvTemperature() + { + return vTemperature; + } + + public void setwTemperature(BigDecimal wTemperature) + { + this.wTemperature = wTemperature; + } + + public BigDecimal getwTemperature() + { + return wTemperature; + } + + public void setModule1Temp(BigDecimal module1Temp) + { + this.module1Temp = module1Temp; + } + + public BigDecimal getModule1Temp() + { + return module1Temp; + } + + public void setModule2Temp(BigDecimal module2Temp) + { + this.module2Temp = module2Temp; + } + + public BigDecimal getModule2Temp() + { + return module2Temp; + } + + public void setModule3Temp(BigDecimal module3Temp) + { + this.module3Temp = module3Temp; + } + + public BigDecimal getModule3Temp() + { + return module3Temp; + } + + public void setModule4Temp(BigDecimal module4Temp) + { + this.module4Temp = module4Temp; + } + + public BigDecimal getModule4Temp() + { + return module4Temp; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -731,6 +829,13 @@ public class EmsPcsData extends BaseEntity .append("sysVCurrent", getSysVCurrent()) .append("sysWCurrent", getSysWCurrent()) .append("dwFrequency", getDwFrequency()) + .append("uTemperature", getuTemperature()) + .append("vTemperature", getvTemperature()) + .append("wTemperature", getwTemperature()) + .append("module1Temp", getModule1Temp()) + .append("module2Temp", getModule2Temp()) + .append("module3Temp", getModule3Temp()) + .append("module4Temp", getModule4Temp()) .toString(); } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempList.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempList.java new file mode 100644 index 0000000..57838fd --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempList.java @@ -0,0 +1,30 @@ +package com.xzzn.ems.domain.vo; + +import java.util.List; + +/** + * 实时运行-PCS最高温度list + * + */ +public class PcsMaxTempList { + + private String deviceId; + // 最高温度数据 + private List maxTempVoList; + + public List getMaxTempVoList() { + return maxTempVoList; + } + + public void setMaxTempVoList(List maxTempVoList) { + this.maxTempVoList = maxTempVoList; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StackAveTempVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempVo.java similarity index 52% rename from ems-system/src/main/java/com/xzzn/ems/domain/vo/StackAveTempVo.java rename to ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempVo.java index 1fe2c2d..04d6978 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StackAveTempVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsMaxTempVo.java @@ -1,29 +1,37 @@ package com.xzzn.ems.domain.vo; import java.math.BigDecimal; -import java.util.Date; /** - * 实时运行-堆平均温度数据 + * 实时运行-PCS最高温度 * */ -public class StackAveTempVo { +public class PcsMaxTempVo { /** * 数据时间 */ - private Date createDate; + private String createDate; /** * 实时温度 */ private BigDecimal temp; + private String deviceId; - public Date getCreateDate() { + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getCreateDate() { return createDate; } - public void setCreateDate(Date createDate) { + public void setCreateDate(String createDate) { this.createDate = createDate; } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java index e80825b..1063752 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java @@ -15,7 +15,7 @@ public class SiteMonitorRuningInfoVo { /** * PCS最高温度 */ - private List stackAveTempList; + private List pcsMaxTempList; /** * 平均soclist @@ -35,12 +35,12 @@ public class SiteMonitorRuningInfoVo { this.pcsPowerList = pcsPowerList; } - public List getStackAveTempList() { - return stackAveTempList; + public List getPcsMaxTempList() { + return pcsMaxTempList; } - public void setStackAveTempList(List stackAveTempList) { - this.stackAveTempList = stackAveTempList; + public void setPcsMaxTempList(List pcsMaxTempList) { + this.pcsMaxTempList = pcsMaxTempList; } public List getBatteryAveSOCList() { 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 b8d5f8c..81b048a 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 @@ -62,15 +62,6 @@ public interface EmsBatteryStackMapper */ public int deleteEmsBatteryStackByIds(Long[] ids); - /** - * 获取实时运行-堆平均温度 - * @param siteId - * @param startDate - * @param endDate - * @return - */ - public List getStackAveTempList(@Param("siteId")String siteId, @Param("startDate") Date startDate, @Param("endDate")Date endDate); - /** * 堆曲线数据-按小时区分 * @param requestVo 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 a3d1bc1..8a76ae6 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 @@ -127,4 +127,9 @@ public interface EmsPcsDataMapper public List getPcsActivePowerByHour(DateSearchRequest requestVo); public List getPcsActivePowerByMonth(DateSearchRequest requestVo); + + // 实时运行-fx-pcs最高温度 + public List getFXMaxTemp(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate); + // 实时运行-dds-pcs最高温度 + public List getDDSMaxTemp(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate); } 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 9a0fe0a..e24eba0 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 @@ -32,7 +32,7 @@ public interface ISingleSiteService public List getAmmeterDataList(String siteId); - public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId); + public SiteMonitorRuningInfoVo getRunningGraphPcsMaxTemp(String siteId); public SiteMonitorRuningInfoVo getRunningGraphBatterySoc(String siteId); diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java index ed70cb8..e67d042 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java @@ -598,6 +598,12 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl pcsData.setTotalApparentPower(StringUtils.getBigDecimal(obj.get("ZLZGL"))); pcsData.setTotalPowerFactor(new BigDecimal(0)); + // 模块温度 + pcsData.setModule1Temp(StringUtils.getBigDecimal(obj.get("IGBYZGWD1"))); + pcsData.setModule2Temp(StringUtils.getBigDecimal(obj.get("IGBYZGWD2"))); + pcsData.setModule3Temp(StringUtils.getBigDecimal(obj.get("IGBYZGWD3"))); + pcsData.setModule4Temp(StringUtils.getBigDecimal(obj.get("IGBYZGWD4"))); + // 系统管理字段 pcsData.setCreateBy("system"); pcsData.setCreateTime(DateUtils.getNowDate()); diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java index 5da9227..d7a7f56 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java @@ -439,6 +439,11 @@ public class FXXDataProcessServiceImpl extends AbstractBatteryDataProcessor impl // pcsData.setDcVoltage(StringUtils.getBigDecimal(obj.get("ChargeableCapacity"))); // pcsData.setDcCurrent(StringUtils.getBigDecimal(obj.get("ChargeableCapacity"))); + // 三相温度 + pcsData.setuTemperature(StringUtils.getBigDecimal(obj.get("DY1UXIGBTWD"))); + pcsData.setvTemperature(StringUtils.getBigDecimal(obj.get("DY1VXIGBTWD"))); + pcsData.setwTemperature(StringUtils.getBigDecimal(obj.get("DY1WXIGBTWD"))); + // 系统管理字段 pcsData.setCreateBy("system"); pcsData.setCreateTime(DateUtils.getNowDate()); 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 7254a49..7b23cee 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 @@ -167,17 +167,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { List pcsPowerList = new ArrayList<>(); List energyStoragePowList = emsPcsDataMapper.getStoragePowerList(siteId, yesterday, today); - // 生成时间列表（每分钟一个） - List targetMinutes = new ArrayList<>(60); - LocalDateTime startDate = DateUtils.toLocalDateTime(yesterday).truncatedTo(ChronoUnit.DAYS); - LocalDateTime endDate = DateUtils.toLocalDateTime(today); - while (startDate.isBefore(endDate)) { - targetMinutes.add(startDate); - startDate = startDate.plusMinutes(1); // 递增1分钟 - } - - // 数据格式转换 - if (!CollectionUtils.isEmpty(energyStoragePowList) && !CollectionUtils.isEmpty(targetMinutes)) { + // List -> 按pcs的deviceId分组转成List + if (!CollectionUtils.isEmpty(energyStoragePowList)) { Map> dataMap = energyStoragePowList.stream() .collect(Collectors.groupingBy( EnergyStoragePowVo::getDeviceId, @@ -191,6 +182,14 @@ public class SingleSiteServiceImpl implements ISingleSiteService { return pcdData; }).collect(Collectors.toList()); + // 生成时间列表（每分钟一个） + List targetMinutes = new ArrayList<>(60); + LocalDateTime startDate = DateUtils.toLocalDateTime(yesterday).truncatedTo(ChronoUnit.DAYS); + LocalDateTime endDate = DateUtils.toLocalDateTime(today); + while (startDate.isBefore(endDate)) { + targetMinutes.add(startDate); + startDate = startDate.plusMinutes(1); // 递增1分钟 + } // 根据时间列表填充数据 pcsPowerList = fullFillData(pcsPowerList,targetMinutes); } @@ -249,21 +248,102 @@ public class SingleSiteServiceImpl implements ISingleSiteService { return resultList; } - // 获取单站监控实时运行-stack平均温度 - // 20250811 按小时 + // 获取单站监控实时运行-pcs最高温度 @Override - public SiteMonitorRuningInfoVo getRunningGraphStackTemp(String siteId) { + public SiteMonitorRuningInfoVo getRunningGraphPcsMaxTemp(String siteId) { SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo(); - if (!StringUtils.isEmpty(siteId)) { - // 时间暂定今日+昨日 - Date today = new Date(); - Date yesterday = DateUtils.addDays(today, -1); - //pcs平均温度list - List stackAveTempVos = emsBatteryStackMapper.getStackAveTempList(siteId, yesterday, today); - siteMonitorRuningInfoVo.setStackAveTempList(stackAveTempVos); + List pcsMaxTempList = new ArrayList<>(); + // 时间暂定今日+昨日 + Date today = new Date(); + Date yesterday = DateUtils.addDays(today, -1); + //PCS最高温度list + List pcsMaxTempVos = new ArrayList<>(); + if (SiteEnum.FX.getCode().equals(siteId)) { + pcsMaxTempVos = emsPcsDataMapper.getFXMaxTemp(siteId, yesterday, today); + } else if (SiteEnum.DDS.getCode().equals(siteId)) { + pcsMaxTempVos = emsPcsDataMapper.getDDSMaxTemp(siteId, yesterday, today); } + + // List -> 按pcs的deviceId分组转成List + if (!CollectionUtils.isEmpty(pcsMaxTempVos)) { + Map> dataMap = pcsMaxTempVos.stream() + .collect(Collectors.groupingBy( + PcsMaxTempVo::getDeviceId, + Collectors.toList())); + + pcsMaxTempList = dataMap.entrySet().stream() + .map(entry -> { + PcsMaxTempList pcdData = new PcsMaxTempList(); + pcdData.setDeviceId(entry.getKey()); + pcdData.setMaxTempVoList(entry.getValue()); + return pcdData; + }).collect(Collectors.toList()); + + // 生成时间列表（每小时一个） + List targetHours = new ArrayList<>(60); + LocalDateTime startDate = DateUtils.toLocalDateTime(yesterday).truncatedTo(ChronoUnit.DAYS); + LocalDateTime endDate = DateUtils.toLocalDateTime(today); + while (startDate.isBefore(endDate)) { + targetHours.add(startDate); + startDate = startDate.plusHours(1); // 递增1小时 + } + // 根据时间列表填充数据 + pcsMaxTempList = fullFillMaxTempData(pcsMaxTempList,targetHours); + } + + siteMonitorRuningInfoVo.setPcsMaxTempList(pcsMaxTempList); return siteMonitorRuningInfoVo; } + private List fullFillMaxTempData(List pcsMaxTempList, List targetHours) { + List resultList = new ArrayList<>(); + + for (PcsMaxTempList pcsMaxTemp : pcsMaxTempList) { + PcsMaxTempList pcsTemp = new PcsMaxTempList(); + List resultVos = new ArrayList<>(); + Map dataMap = new HashMap<>(); + + String deviceId = pcsMaxTemp.getDeviceId(); + List pcsMaxTempVos = pcsMaxTemp.getMaxTempVoList(); + if (CollectionUtils.isEmpty(pcsMaxTempVos)) { + continue; + } + + // 将数据转Map便于后续根据时间获取 + dataMap = pcsMaxTempVos.stream().collect( + Collectors.toMap( + data -> data.getCreateDate(), + data -> data, + (existing, replacement) -> replacement + )); + + PcsMaxTempVo lastData = null; + List resultTempList = new ArrayList<>(); + // 遍历时间填充数据 + for (LocalDateTime targetHour : targetHours) { + String currentDate = DateUtils.convertToString(targetHour); + PcsMaxTempVo currentData = dataMap.get(currentDate); + if (currentData == null && lastData != null) { + BigDecimal temp = lastData.getTemp(); + currentData = new PcsMaxTempVo(); + currentData.setTemp(temp); + currentData.setDeviceId(deviceId); + } else if (currentData == null && lastData == null){ + // 开头无数据，所有字段设为null + currentData = new PcsMaxTempVo(); + currentData.setDeviceId(deviceId); + } + lastData = currentData; + currentData.setCreateDate(currentDate.substring(11)); + resultTempList.add(currentData); + + } + pcsTemp.setDeviceId(deviceId); + pcsTemp.setMaxTempVoList(resultTempList); + resultList.add(pcsTemp); + } + return resultList; + } + // 获取单站监控实时运行-平均soc @Override public SiteMonitorRuningInfoVo getRunningGraphBatterySoc(String siteId) { diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index bd8419b..560f619 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -57,10 +57,17 @@ + + + + + + + - select id, data_update_time, work_status, grid_status, device_status, control_mode, total_active_power, daily_ac_charge_energy, a_phase_voltage, a_phase_current, total_reactive_power, daily_ac_discharge_energy, b_phase_voltage, b_phase_current, total_apparent_power, pcs_module_temperature, c_phase_voltage, c_phase_current, total_power_factor, pcs_environment_temperature, ac_frequency, branch_status, discharge_status, dc_power, dc_voltage, dc_current, create_by, create_time, update_by, update_time, remark, site_id, device_id, date_month, date_day, total_ac_charge_energy, total_ac_discharge_energy, ac_charge_active_power, ac_capacitive_reactive_power, ac_discharge_active_power, ac_inductive_reactive_power, max_capacitive_power_capacity, max_inductive_power_capacity, max_charge_power_capacity, max_discharge_power_capacity, ac_switch_status, dc_switch_status, remote_control_status, sys_u_current, sys_v_current, sys_w_current, dw_frequency from ems_pcs_data + select id, data_update_time, work_status, grid_status, device_status, control_mode, total_active_power, daily_ac_charge_energy, a_phase_voltage, a_phase_current, total_reactive_power, daily_ac_discharge_energy, b_phase_voltage, b_phase_current, total_apparent_power, pcs_module_temperature, c_phase_voltage, c_phase_current, total_power_factor, pcs_environment_temperature, ac_frequency, branch_status, discharge_status, dc_power, dc_voltage, dc_current, create_by, create_time, update_by, update_time, remark, site_id, device_id, date_month, date_day, total_ac_charge_energy, total_ac_discharge_energy, ac_charge_active_power, ac_capacitive_reactive_power, ac_discharge_active_power, ac_inductive_reactive_power, max_capacitive_power_capacity, max_inductive_power_capacity, max_charge_power_capacity, max_discharge_power_capacity, ac_switch_status, dc_switch_status, remote_control_status, sys_u_current, sys_v_current, sys_w_current, dw_frequency, u_temperature, v_temperature, w_temperature, module1_temp, module2_temp, module3_temp, module4_temp from ems_pcs_data @@ -174,6 +188,13 @@ sys_v_current, sys_w_current, dw_frequency, + u_temperature, + v_temperature, + w_temperature, + module1_temp, + module2_temp, + module3_temp, + module4_temp, #{dataUpdateTime}, @@ -227,6 +248,13 @@ #{sysVCurrent}, #{sysWCurrent}, #{dwFrequency}, + #{uTemperature}, + #{vTemperature}, + #{wTemperature}, + #{module1Temp}, + #{module2Temp}, + #{module3Temp}, + #{module4Temp}, @@ -284,6 +312,13 @@ sys_v_current = #{sysVCurrent}, sys_w_current = #{sysWCurrent}, dw_frequency = #{dwFrequency}, + u_temperature = #{uTemperature}, + v_temperature = #{vTemperature}, + w_temperature = #{wTemperature}, + module1_temp = #{module1Temp}, + module2_temp = #{module2Temp}, + module3_temp = #{module3Temp}, + module4_temp = #{module4Temp}, where id = #{id} @@ -539,4 +574,43 @@ AND latest.max_update_time = t.data_update_time order by statisDate desc + + + + \ No newline at end of file