PCS开关机相关配置不在数据表维护

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();
     }
 }

ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java

@@ -140,6 +140,4 @@ public interface EmsPcsDataMapper
     public List<PcsMaxTempVo> getFXMaxTemp(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
     // 实时运行-dds-pcs最高温度
     public List<PcsMaxTempVo> getDDSMaxTemp(@Param("siteId")String siteId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
-
-    List<EmsPcsData> getSitePcsDataInfo(@Param("siteId") String siteId);
 }

ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml

@@ -64,11 +64,6 @@
         <result property="module2Temp"    column="module2_temp"    />
         <result property="module3Temp"    column="module3_temp"    />
         <result property="module4Temp"    column="module4_temp"    />
-        <result property="clusterNum"    column="cluster_num"    />
-        <result property="cluster1ActivePower"    column="cluster1_active_power"    />
-        <result property="cluster2ActivePower"    column="cluster2_active_power"    />
-        <result property="cluster3ActivePower"    column="cluster3_active_power"    />
-        <result property="cluster4ActivePower"    column="cluster4_active_power"    />
     </resultMap>
 
     <sql id="selectEmsPcsDataVo">
@@ -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
     </sql>
 
     <select id="selectEmsPcsDataList" parameterType="EmsPcsData" resultMap="EmsPcsDataResult">
@@ -139,11 +134,6 @@
             <if test="module2Temp != null "> and module2_temp = #{module2Temp}</if>
             <if test="module3Temp != null "> and module3_temp = #{module3Temp}</if>
             <if test="module4Temp != null "> and module4_temp = #{module4Temp}</if>
-            <if test="clusterNum != null "> and cluster_num = #{clusterNum}</if>
-            <if test="cluster1ActivePower != null "> and cluster1_active_power = #{cluster1ActivePower}</if>
-            <if test="cluster2ActivePower != null "> and cluster2_active_power = #{cluster2ActivePower}</if>
-            <if test="cluster3ActivePower != null "> and cluster3_active_power = #{cluster3ActivePower}</if>
-            <if test="cluster4ActivePower != null "> and cluster4_active_power = #{cluster4ActivePower}</if>
         </where>
     </select>
 
@@ -213,11 +203,6 @@
             <if test="module2Temp != null">module2_temp,</if>
             <if test="module3Temp != null">module3_temp,</if>
             <if test="module4Temp != null">module4_temp,</if>
-            <if test="clusterNum != null">cluster_num,</if>
-            <if test="cluster1ActivePower != null">cluster1_active_power,</if>
-            <if test="cluster2ActivePower != null">cluster2_active_power,</if>
-            <if test="cluster3ActivePower != null">cluster3_active_power,</if>
-            <if test="cluster4ActivePower != null">cluster4_active_power,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dataUpdateTime != null">#{dataUpdateTime},</if>
@@ -278,11 +263,6 @@
             <if test="module2Temp != null">#{module2Temp},</if>
             <if test="module3Temp != null">#{module3Temp},</if>
             <if test="module4Temp != null">#{module4Temp},</if>
-            <if test="clusterNum != null">#{clusterNum},</if>
-            <if test="cluster1ActivePower != null">#{cluster1ActivePower},</if>
-            <if test="cluster2ActivePower != null">#{cluster2ActivePower},</if>
-            <if test="cluster3ActivePower != null">#{cluster3ActivePower},</if>
-            <if test="cluster4ActivePower != null">#{cluster4ActivePower},</if>
         </trim>
     </insert>
 
@@ -347,11 +327,6 @@
             <if test="module2Temp != null">module2_temp = #{module2Temp},</if>
             <if test="module3Temp != null">module3_temp = #{module3Temp},</if>
             <if test="module4Temp != null">module4_temp = #{module4Temp},</if>
-            <if test="clusterNum != null">cluster_num = #{clusterNum},</if>
-            <if test="cluster1ActivePower != null">cluster1_active_power = #{cluster1ActivePower},</if>
-            <if test="cluster2ActivePower != null">cluster2_active_power = #{cluster2ActivePower},</if>
-            <if test="cluster3ActivePower != null">cluster3_active_power = #{cluster3ActivePower},</if>
-            <if test="cluster4ActivePower != null">cluster4_active_power = #{cluster4ActivePower},</if>
         </trim>
         where id = #{id}
     </update>
@@ -655,20 +630,4 @@
             group by deviceId,dateDay,createDate,temp
             order by dateDay,createDate
     </select>
-    <select id="getSitePcsDataInfo" resultType="com.xzzn.ems.domain.EmsPcsData">
-        select
-            t.device_id as deviceId,
-            t.site_id as siteId,
-            t.cluster_num as clusterNum
-        from ems_pcs_data t
-                 INNER JOIN (
-            select p.site_id, p.device_id, MAX(p.create_time) as max_time
-            from ems_pcs_data p
-            where p.site_id = #{siteId}
-            group by p.site_id, p.device_id
-        ) latest on t.site_id = latest.site_id
-            and t.device_id = latest.device_id
-            and t.create_time = latest.max_time
-        where t.site_id = #{siteId}
-    </select>
 </mapper>