运行策略页面开始和结束时间显示按照升序排序

ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java

@@ -236,6 +236,10 @@ public class EmsPcsData extends BaseEntity
     @Excel(name = "4#模块IGBT最高温")
     private BigDecimal module4Temp;
 
+    /** 电池簇数 */
+    @Excel(name = "电池簇数")
+    private Integer clusterNum;
+
     /** 电池簇1PCS有功功率给定 */
     @Excel(name = "电池簇1PCS有功功率给定")
     private BigDecimal cluster1ActivePower;
@@ -792,6 +796,14 @@ 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;
     }
@@ -886,6 +898,7 @@ 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())

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

@@ -64,6 +64,7 @@
         <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"    />
@@ -79,7 +80,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, cluster1_active_power, cluster2_active_power, cluster3_active_power, cluster4_active_power from ems_pcs_data
+               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
     </sql>
 
     <select id="selectEmsPcsDataList" parameterType="EmsPcsData" resultMap="EmsPcsDataResult">
@@ -138,6 +139,7 @@
             <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>
@@ -211,6 +213,7 @@
             <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>
@@ -275,6 +278,7 @@
             <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>
@@ -343,6 +347,7 @@
             <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>

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

@@ -138,6 +138,7 @@
     <select id="selectStrategyTempByTempId" parameterType="String" resultMap="EmsStrategyTempResult">
         <include refid="selectEmsStrategyTempVo"/>
         where template_id = #{templateId}
+        order by start_time, end_time
     </select>
 
     <delete id="deleteTempByTempId" parameterType="String">
@@ -147,6 +148,7 @@
     <select id="getTempListBySiteIdAndStrategyId" resultMap="EmsStrategyTempResult">
         <include refid="selectEmsStrategyTempVo"/>
         where site_id = #{siteId} and strategy_id = #{strategyId}
+        order by start_time, end_time
     </select>
 
 </mapper>