Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowStatusSnapshootMapper.java

@@ -47,4 +47,13 @@ public interface FlowStatusSnapshootMapper {
      * @return
      */
     List<FlowStatusSnapshoot> findByTime(@Param("startTime")Long startTime, @Param("endTime")Long endTime);
+
+    /**
+     * 根据天、小时、工作流id获取快照信息
+     * @param date
+     * @param hour
+     * @param flowId
+     * @return
+     */
+    List<FlowStatusSnapshoot> findByDateAndHourAndFlowId(@Param("date")String date, @Param("hour")String hour, @Param("flowId")Integer flowId);
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowStatusSnapshootMapper.xml

@@ -205,7 +205,12 @@
     where snapshoot_time >= #{startTime}
     and snapshoot_time <= #{endTime}
   </select>
-  <delete id="deleteOutSnapShoot" parameterType="java.lang.Long">
+    <select id="findByDateAndHourAndFlowId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List" />
+    from flow_status_snapshoot
+    where `day` = #{date} and `hour` = #{hour} and flow_id = #{flowId}
+    </select>
+    <delete id="deleteOutSnapShoot" parameterType="java.lang.Long">
     delete from flow_status_snapshoot
     where snapshoot_time = #{outTime,jdbcType=BIGINT}
   </delete>