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 7408445..08f3849 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java @@ -13,8 +13,8 @@ import java.util.List; public interface RenderWorkerMapper { List list(RenderWorkerReqQuery renderWorkerReqQuery); RenderWorkerEntity getById(Long id); - int add(RenderWorkerEntity member); + int add(RenderWorkerEntity renderWorker); int deleteById(Long id); - int update(RenderWorkerEntity member); + int update(RenderWorkerEntity renderWorker); int updateStatus(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 9dfc235..99e2cd3 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java @@ -15,9 +15,9 @@ import java.util.List; public interface ScenicMapper { List list(ScenicReqQuery scenicReqQuery); ScenicRespVO getById(Long id); - int add(ScenicEntity member); + int add(ScenicEntity scenic); int deleteById(Long id); - int update(ScenicEntity member); + int update(ScenicEntity scenic); int updateStatus(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 new file mode 100644 index 0000000..cdbd3b5 --- /dev/null +++ b/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java @@ -0,0 +1,22 @@ +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 java.util.List; + +/** + * @Author:longbinbin + * @Date:2024/12/2 11:21 + */ +public interface SourceMapper { + List list(SourceReqQuery sourceReqQuery); + SourceRespVO getById(Long id); + int add(SourceEntity source); + int deleteById(Long id); + int update(SourceEntity source); +} diff --git a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java index d9cdce0..c3ff059 100644 --- a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java @@ -1,6 +1,7 @@ package com.ycwl.basic.model.pc.broker.req; import com.baomidou.mybatisplus.annotation.TableId; +import com.ycwl.basic.model.common.BaseQueryParameterReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,7 @@ import java.util.Date; */ @Data @ApiModel("查询推客列表请求参数") -public class BrokerReqQuery { +public class BrokerReqQuery extends BaseQueryParameterReq { private Long id; @ApiModelProperty("推客名称") private String name; diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java index 812adc1..e9a05b8 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java @@ -1,6 +1,7 @@ package com.ycwl.basic.model.pc.device.req; import com.baomidou.mybatisplus.annotation.TableId; +import com.ycwl.basic.model.common.BaseQueryParameterReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,7 @@ import java.util.Date; */ @Data @ApiModel("设备查询参数") -public class DeviceReqQuery { +public class DeviceReqQuery extends BaseQueryParameterReq { @ApiModelProperty("景区id") private Long scenicId; @ApiModelProperty("设备名称") diff --git a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java index 0af86f9..e6014e4 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java @@ -1,6 +1,7 @@ package com.ycwl.basic.model.pc.face.req; import com.baomidou.mybatisplus.annotation.TableId; +import com.ycwl.basic.model.common.BaseQueryParameterReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +15,7 @@ import java.util.Date; */ @Data @ApiModel("人脸查询参数") -public class FaceReqQuery { +public class FaceReqQuery extends BaseQueryParameterReq { @ApiModelProperty("会员id") private Long memberId; @ApiModelProperty("用户上传的人脸照片") diff --git a/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java index 9c91063..6ab0884 100644 --- a/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.faceSample.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; @@ -14,7 +15,7 @@ import java.util.Date; */ @Data @ApiModel("人脸样本查询参数") -public class FaceSampleReqQuery { +public class FaceSampleReqQuery extends BaseQueryParameterReq { /** * 来源设备 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java index 162096b..02efdde 100644 --- a/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.member.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; @@ -14,7 +15,7 @@ import java.util.Date; */ @Data @ApiModel("查询用户列表请求参数") -public class MemberReqQuery { +public class MemberReqQuery extends BaseQueryParameterReq { /** * 微信openId */ diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java index f40ff5c..1cbcc94 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.order.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; @@ -15,7 +16,7 @@ import java.util.Date; */ @Data @ApiModel(value = "订单查询对象") -public class OrderReqQuery { +public class OrderReqQuery extends BaseQueryParameterReq { @ApiModelProperty("用户昵称") private String memberNickname; @ApiModelProperty("用户真实名称") diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java index 64f1cb7..520be7e 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.renderWorker.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; @@ -16,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel("渲染机列表查询参数") -public class RenderWorkerReqQuery { +public class RenderWorkerReqQuery extends BaseQueryParameterReq { @TableId private Long id; /** diff --git a/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java b/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java index 9ad279f..9d05ca9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java @@ -1,5 +1,6 @@ package com.ycwl.basic.model.pc.role.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,5 +17,6 @@ public class RoleListRespVO { @ApiModelProperty(value = "0正常 1关闭") private Integer status; @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java index 6837513..da1e9c6 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicConfigEntity.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.scenic.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -35,5 +36,6 @@ public class ScenicConfigEntity { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java index 00a1d83..d73d2a3 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java @@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.scenic.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; @@ -16,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel("景区列表查询参数") -public class ScenicReqQuery { +public class ScenicReqQuery extends BaseQueryParameterReq { /** * 景区名称 */ diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java index b4eac53..05fcc76 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java @@ -1,5 +1,6 @@ package com.ycwl.basic.model.pc.scenic.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -67,7 +68,9 @@ public class ScenicRespVO { */ @ApiModelProperty("状态 1启用0关闭") private String status; + @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; @ApiModelProperty("景区配置") private ScenicConfigEntity scenicConfig; diff --git a/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java b/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java new file mode 100644 index 0000000..47e2b26 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java @@ -0,0 +1,38 @@ +package com.ycwl.basic.model.pc.source.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/12/02 11:29 + * 视频源 + */ +@Data +@TableName("source") +public class SourceEntity { + @TableId + private Long id; + /** + * 景区id + */ + private Long scenicId; + /** + * 来源设备id + */ + private Long deviceId; + /** + * 所属用户 + */ + private Long memberId; + /** + * 文件存储地址 + */ + private String url; + private Date createTime; + private Date updateTime; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java new file mode 100644 index 0000000..7cf2a02 --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java @@ -0,0 +1,45 @@ +package com.ycwl.basic.model.pc.source.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.math.BigDecimal; +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/12/02 11:29 + * 视频源 + */ +@Data +@ApiModel(value = "视频源查询对象") +public class SourceReqQuery extends BaseQueryParameterReq { + @TableId + private Long id; + /** + * 景区id + */ + @ApiModelProperty("景区id") + private Long scenicId; + /** + * 来源设备id + */ + @ApiModelProperty("来源设备id") + private Long deviceId; + /** + * 所属用户 + */ + @ApiModelProperty("所属用户") + private Long memberId; + /** + * 文件存储地址 + */ + @ApiModelProperty("文件存储地址") + private String url; + private Date startTime; + private Date endTime; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java b/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java new file mode 100644 index 0000000..a35099b --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java @@ -0,0 +1,47 @@ +package com.ycwl.basic.model.pc.source.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 11:29 + * 视频源 + */ +@Data +@ApiModel(value = "视频源响应对象") +public class SourceRespVO { + @TableId + private Long id; + /** + * 景区id + */ + @ApiModelProperty("景区id") + private Long scenicId; + @ApiModelProperty("景区名称") + private String scenicName; + /** + * 来源设备id + */ + @ApiModelProperty("来源设备id") + private Long deviceId; + /** + * 所属用户 + */ + @ApiModelProperty("所属用户") + private Long memberId; + /** + * 文件存储地址 + */ + @ApiModelProperty("文件存储地址") + private String url; + @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 b0604c4..8fd25d1 100644 --- a/src/main/resources/mapper/pc/ScenicMapper.xml +++ b/src/main/resources/mapper/pc/ScenicMapper.xml @@ -114,7 +114,7 @@ - + diff --git a/src/main/resources/mapper/pc/SourceMapper.xml b/src/main/resources/mapper/pc/SourceMapper.xml new file mode 100644 index 0000000..accc799 --- /dev/null +++ b/src/main/resources/mapper/pc/SourceMapper.xml @@ -0,0 +1,38 @@ + + + + + insert into source(id, scenic_id, device_id, member_id, url) values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}) + + + update source + + scenic_id = #{scenicId}, + device_id = #{deviceId}, + member_id = #{memberId}, + url = #{url}, + + where id = #{id} + + + delete from source where id = #{id} + + + + + \ No newline at end of file