diff --git a/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java index 42729ed..d5cdc8c 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java @@ -2,6 +2,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @Date:2024/11/29 14:15 * 推客/推广人 */ +@Mapper public interface BrokerMapper { List list(BrokerReqQuery brokerReqQuery); BrokerEntity getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java index f175456..cd69b5b 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java @@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * @Date:2024/11/29 14:48 * device(设备管理) */ +@Mapper public interface DeviceMapper { List list(DeviceReqQuery deviceReqQuery); DeviceRespVO getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java index ada162d..12bb42e 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java @@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.req.FaceReqQuery; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @Date:2024/11/29 15:09 * 用户人脸 */ +@Mapper public interface FaceMapper { List list(FaceReqQuery faceReqQuery); FaceRespVO getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java index e1a1090..79b13a8 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java @@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @Date:2024/11/29 15:38 * 人脸样本(设备上报)检索 */ +@Mapper public interface FaceSampleMapper { List list(FaceSampleReqQuery faceSampleReqQuery); FaceSampleRespVO getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java index 96fd380..5cacefb 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java @@ -2,6 +2,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.member.entity.MemberEntity; import com.ycwl.basic.model.pc.member.req.MemberReqQuery; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @Date:2024/11/29 15:57 * 用户(前台) */ +@Mapper public interface MemberMapper { List list(MemberReqQuery memberReqQuery); MemberEntity getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java index 2a1b34f..dde0b17 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java @@ -3,6 +3,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.order.entity.OrderEntity; import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * @Date:2024/11/29 16:32 * 订单 */ +@Mapper public interface OrderMapper { List list(OrderReqQuery orderReqQuery); OrderEntity getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java index 08f3849..8a9b1af 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java @@ -2,6 +2,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @Date:2024/11/29 17:22 * 渲染机管理表 */ +@Mapper public interface RenderWorkerMapper { List list(RenderWorkerReqQuery renderWorkerReqQuery); RenderWorkerEntity getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java index 99e2cd3..09801a9 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java @@ -4,6 +4,7 @@ import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @Date:2024/12/2 10:07 * 景区管理表 */ +@Mapper public interface ScenicMapper { List list(ScenicReqQuery scenicReqQuery); ScenicRespVO getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java index cdbd3b5..ea3b3ff 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java @@ -1,18 +1,18 @@ package com.ycwl.basic.mapper.pc; -import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; -import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; -import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.source.req.SourceReqQuery; import com.ycwl.basic.model.pc.source.resp.SourceRespVO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * @Author:longbinbin * @Date:2024/12/2 11:21 + * 视频源 */ +@Mapper public interface SourceMapper { List list(SourceReqQuery sourceReqQuery); SourceRespVO getById(Long id); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java new file mode 100644 index 0000000..21eaeac --- /dev/null +++ b/src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java @@ -0,0 +1,26 @@ +package com.ycwl.basic.mapper.pc; + +import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; +import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; +import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; +import com.ycwl.basic.model.pc.task.entity.TaskEntity; +import com.ycwl.basic.model.pc.task.req.TaskReqQuery; +import com.ycwl.basic.model.pc.task.resp.TaskRespVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author:longbinbin + * @Date:2024/12/2 14:06 + * 任务列表 + */ +@Mapper +public interface TaskMapper { + List list(TaskReqQuery taskReqQuery); + TaskRespVO getById(Long id); + int add(TaskEntity task); + int deleteById(Long id); + int update(TaskEntity task); + int updateStatus(Long id,Integer status); +} diff --git a/src/main/java/com/ycwl/basic/model/pc/task/entity/TaskEntity.java b/src/main/java/com/ycwl/basic/model/pc/task/entity/TaskEntity.java new file mode 100644 index 0000000..0465039 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/task/entity/TaskEntity.java @@ -0,0 +1,53 @@ +package com.ycwl.basic.model.pc.task.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/12/02 14:10 + * 任务列表 + */ +@Data +@TableName("task") +public class TaskEntity { + @TableId + private Long id; + /** + * 执行任务的机器ID,render_worker.id + */ + private Long workerId; + /** + * 用户ID,可以不和用户关联 + */ + private Long memberId; + /** + * 模板ID + */ + private Long templateId; + /** + * 景区ID + */ + private Long scenicId; + /** + * 任务参数,JSON字符串 + */ + private String taskParams; + /** + * 视频链接,未完成状态下没有 + */ + private String videoUrl; + /** + * 状态,0未完成,1已完成,2正在处理 + */ + private Integer status; + /** + * 结果,不管成功还是失败 + */ + private String result; + private Date createTime; + private Date updateTime; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java new file mode 100644 index 0000000..6f87ea0 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java @@ -0,0 +1,64 @@ +package com.ycwl.basic.model.pc.task.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ycwl.basic.model.common.BaseQueryParameterReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/12/02 14:10 + * 任务列表 + */ +@Data +@ApiModel("任务列表查询参数") +public class TaskReqQuery extends BaseQueryParameterReq { + @TableId + private Long id; + /** + * 执行任务的机器ID,render_worker.id + */ + @ApiModelProperty("执行任务的机器ID") + private Long workerId; + /** + * 用户ID,可以不和用户关联 + */ + @ApiModelProperty("用户ID") + private Long memberId; + /** + * 模板ID + */ + @ApiModelProperty("模板ID") + private Long templateId; + /** + * 景区ID + */ + @ApiModelProperty("景区ID") + private Long scenicId; + /** + * 任务参数,JSON字符串 + */ + @ApiModelProperty("任务参数") + private String taskParams; + /** + * 视频链接,未完成状态下没有 + */ + @ApiModelProperty("视频链接") + private String videoUrl; + /** + * 状态,0未完成,1已完成,2正在处理 + */ + @ApiModelProperty("状态") + private Integer status; + /** + * 结果,不管成功还是失败 + */ + @ApiModelProperty("结果") + private String result; + private Date startTime; + private Date endTime; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java b/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java new file mode 100644 index 0000000..dedd282 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java @@ -0,0 +1,64 @@ +package com.ycwl.basic.model.pc.task.resp; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/12/02 14:10 + * 任务列表 + */ +@Data +@ApiModel("查询任务列表响应参数") +public class TaskRespVO { + private Long id; + /** + * 执行任务的机器ID,render_worker.id + */ + @ApiModelProperty("执行任务的机器ID") + private Long workerId; + /** + * 用户ID,可以不和用户关联 + */ + @ApiModelProperty("用户ID") + private Long memberId; + /** + * 模板ID + */ + @ApiModelProperty("模板ID") + private Long templateId; + /** + * 景区ID + */ + @ApiModelProperty("景区ID") + private Long scenicId; + /** + * 任务参数,JSON字符串 + */ + @ApiModelProperty("任务参数") + private String taskParams; + /** + * 视频链接,未完成状态下没有 + */ + @ApiModelProperty("视频链接") + private String videoUrl; + /** + * 状态,0未完成,1已完成,2正在处理 + */ + @ApiModelProperty("状态") + private Integer status; + /** + * 结果,不管成功还是失败 + */ + @ApiModelProperty("结果") + private String result; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; +} diff --git a/src/main/resources/mapper/pc/ScenicMapper.xml b/src/main/resources/mapper/pc/ScenicMapper.xml index 8fd25d1..7f63a69 100644 --- a/src/main/resources/mapper/pc/ScenicMapper.xml +++ b/src/main/resources/mapper/pc/ScenicMapper.xml @@ -90,6 +90,12 @@ and `status` = #{status} + + and s.create_time >= #{startTime} + + + and s.create_time <= #{endTime} + + select id, worker_id, member_id, template_id, scenic_id, task_params, video_url, `status`, result, create_time, update_time +from task + + and worker_id = #{workerId} + and member_id = #{memberId} + and template_id = #{templateId} + and scenic_id = #{scenicId} + and `status` = #{status} + and create_time >= #{startTime} + and create_time <= #{endTime} + + + + \ No newline at end of file