From dbdf1a5a61fcd831b17a39ec4da59b609aed5422 Mon Sep 17 00:00:00 2001 From: zq Date: Mon, 5 Jan 2026 14:23:30 +0800 Subject: [PATCH] =?UTF-8?q?PCS=E5=BC=80=E5=85=B3=E6=9C=BA=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=E4=B8=8D=E5=9C=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xzzn/ems/domain/EmsPcsData.java | 65 ------------------- .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 2 - .../resources/mapper/ems/EmsPcsDataMapper.xml | 43 +----------- 3 files changed, 1 insertion(+), 109 deletions(-) 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 1d7b7c7..0b654e0 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 @@ -236,26 +236,6 @@ public class EmsPcsData extends BaseEntity @Excel(name = "4#模块IGBT最高温") private BigDecimal module4Temp; - /** 电池簇数 */ - @Excel(name = "电池簇数") - private Integer clusterNum; - - /** 电池簇1PCS有功功率给定 */ - @Excel(name = "电池簇1PCS有功功率给定") - private BigDecimal cluster1ActivePower; - - /** 电池簇2PCS有功功率给定 */ - @Excel(name = "电池簇2PCS有功功率给定") - private BigDecimal cluster2ActivePower; - - /** 电池簇3PCS有功功率给定 */ - @Excel(name = "电池簇3PCS有功功率给定") - private BigDecimal cluster3ActivePower; - - /** 电池簇4PCS有功功率给定 */ - @Excel(name = "电池簇4PCS有功功率给定") - private BigDecimal cluster4ActivePower; - public void setId(Long id) { this.id = id; @@ -796,46 +776,6 @@ public class EmsPcsData extends BaseEntity return module4Temp; } - public Integer getClusterNum() { - return clusterNum; - } - - public void setClusterNum(Integer clusterNum) { - this.clusterNum = clusterNum; - } - - public BigDecimal getCluster1ActivePower() { - return cluster1ActivePower; - } - - public void setCluster1ActivePower(BigDecimal cluster1ActivePower) { - this.cluster1ActivePower = cluster1ActivePower; - } - - public BigDecimal getCluster2ActivePower() { - return cluster2ActivePower; - } - - public void setCluster2ActivePower(BigDecimal cluster2ActivePower) { - this.cluster2ActivePower = cluster2ActivePower; - } - - public BigDecimal getCluster3ActivePower() { - return cluster3ActivePower; - } - - public void setCluster3ActivePower(BigDecimal cluster3ActivePower) { - this.cluster3ActivePower = cluster3ActivePower; - } - - public BigDecimal getCluster4ActivePower() { - return cluster4ActivePower; - } - - public void setCluster4ActivePower(BigDecimal cluster4ActivePower) { - this.cluster4ActivePower = cluster4ActivePower; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -898,11 +838,6 @@ public class EmsPcsData extends BaseEntity .append("module2Temp", getModule2Temp()) .append("module3Temp", getModule3Temp()) .append("module4Temp", getModule4Temp()) - .append("clusterNum", getClusterNum()) - .append("cluster1ActivePower", getCluster1ActivePower()) - .append("cluster2ActivePower", getCluster2ActivePower()) - .append("cluster3ActivePower", getCluster3ActivePower()) - .append("cluster4ActivePower", getCluster4ActivePower()) .toString(); } } 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 2292584..bd9ccf6 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 @@ -140,6 +140,4 @@ public interface EmsPcsDataMapper 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); - - List getSitePcsDataInfo(@Param("siteId") 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 82754b8..b6f0bba 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -64,11 +64,6 @@ - - - - - @@ -80,7 +75,7 @@ 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, cluster_num, cluster1_active_power, cluster2_active_power, cluster3_active_power, cluster4_active_power from ems_pcs_data + module1_temp, module2_temp, module3_temp, module4_temp from ems_pcs_data @@ -213,11 +203,6 @@ module2_temp, module3_temp, module4_temp, - cluster_num, - cluster1_active_power, - cluster2_active_power, - cluster3_active_power, - cluster4_active_power, #{dataUpdateTime}, @@ -278,11 +263,6 @@ #{module2Temp}, #{module3Temp}, #{module4Temp}, - #{clusterNum}, - #{cluster1ActivePower}, - #{cluster2ActivePower}, - #{cluster3ActivePower}, - #{cluster4ActivePower}, @@ -347,11 +327,6 @@ module2_temp = #{module2Temp}, module3_temp = #{module3Temp}, module4_temp = #{module4Temp}, - cluster_num = #{clusterNum}, - cluster1_active_power = #{cluster1ActivePower}, - cluster2_active_power = #{cluster2ActivePower}, - cluster3_active_power = #{cluster3ActivePower}, - cluster4_active_power = #{cluster4ActivePower}, where id = #{id} @@ -655,20 +630,4 @@ group by deviceId,dateDay,createDate,temp order by dateDay,createDate - \ No newline at end of file