@@ -42,7 +42,7 @@ public class VideoSchedule { | |||||
@Scheduled(cron = "0 20/30 * * * *?") // 每小时检查一次 | @Scheduled(cron = "0 20/30 * * * *?") // 每小时检查一次 | ||||
public void userVideoCreateSchedule() { | public void userVideoCreateSchedule() { | ||||
UserMouldVideo userVideo = new UserMouldVideo(); | UserMouldVideo userVideo = new UserMouldVideo(); | ||||
userVideo.setStartDate(DateUtils.getHourDateBefore(2,new Date())); | |||||
userVideo.setVideoStartDate(DateUtils.getHourDateBefore(2,new Date())); | |||||
userVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); | userVideo.setVideoStatus(EnumVideoStatus.fail.getCode()); | ||||
List<UserMouldVideo> list = userMouldVideoService.findList(userVideo); | List<UserMouldVideo> list = userMouldVideoService.findList(userVideo); | ||||
if (list != null && list.size() > 0) { | if (list != null && list.size() > 0) { | ||||
@@ -26,13 +26,21 @@ public class UserMouldVideo extends TenantEntity { | |||||
protected Long id; | protected Long id; | ||||
@TableField(exist = false) | @TableField(exist = false) | ||||
@io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startDate") | |||||
@io.swagger.annotations.ApiModelProperty(value="查询-创建起始时间",name="startDate") | |||||
private Date startDate; | private Date startDate; | ||||
@TableField(exist = false) | @TableField(exist = false) | ||||
@io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="endDate") | |||||
@io.swagger.annotations.ApiModelProperty(value="查询-创建结束时间",name="endDate") | |||||
private Date endDate; | private Date endDate; | ||||
@TableField(exist = false) | |||||
@io.swagger.annotations.ApiModelProperty(value="查询-生成视频起始时间",name="videoStartDate") | |||||
private Date videoStartDate; | |||||
@TableField(exist = false) | |||||
@io.swagger.annotations.ApiModelProperty(value="查询-生成视频结束时间",name="videoEndDate") | |||||
private Date videoEndDate; | |||||
@io.swagger.annotations.ApiModelProperty(value="用户Id",name="userId") | @io.swagger.annotations.ApiModelProperty(value="用户Id",name="userId") | ||||
private Long userId; | private Long userId; | ||||
@@ -84,6 +84,13 @@ | |||||
and create_date < #{endDate} | and create_date < #{endDate} | ||||
</if> | </if> | ||||
<if test=" null != videoStartDate "> | |||||
and create_video_date >= #{videoStartDate} | |||||
</if> | |||||
<if test=" null != videoEndDate"> | |||||
and create_video_date < #{videoEndDate} | |||||
</if> | |||||
<if test=" null != ids "> | <if test=" null != ids "> | ||||
and id in | and id in | ||||
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||