diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html index a8ac865..13ec28f 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html @@ -8,7 +8,13 @@
- + +
+ +
+
+
+
@@ -24,7 +30,7 @@
-
@@ -44,27 +50,49 @@
- +
- +
- +
- +
- +
- +
- + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
@@ -73,12 +101,6 @@
-
- -
- -
-
@@ -89,7 +111,16 @@
- + +
+
+ + +
+
+
+
+
@@ -115,6 +146,13 @@ minView: "month", autoclose: true }); + + $("input[name='upTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html index a65278e..e38e07e 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html @@ -9,13 +9,13 @@
- +
- +
- +
@@ -23,7 +23,7 @@
-
@@ -36,6 +36,22 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -45,33 +61,33 @@
- +
- +
- +
- +
- +
- +
- +
- +
@@ -86,6 +102,15 @@
+
+ +
+
+ + +
+
+
@@ -95,6 +120,12 @@
+
+ +
+ +
+
@@ -116,6 +147,12 @@ minView: "month", autoclose: true }); + + $("input[name='upTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html index 89c3715..fbc7070 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html @@ -49,6 +49,8 @@ var prefix = ctx + "system/playlet/item"; var typeDict = [[${@dict.getType('playlet_source_type')}]]; var completeDict = [[${@dict.getType('playlet_complete_type')}]]; + var videoTypeDict = [[${@dict.getType('playlet_video_type')}]]; + var labelTypeDict = [[${@dict.getType('playlet_label_type')}]]; $(function() { var options = { @@ -67,9 +69,8 @@ visible: false }, { - field: 'remark', - title: '备注信息', - visible: false + field: 'itemId', + title: '剧集ID' }, { field: 'itemTypeName', @@ -85,7 +86,15 @@ }, { field: 'videoName', - title: '视频名称' + title: '短剧标题' + }, + { + field: 'actorName', + title: '主角名' + }, + { + field: 'producer', + title: '出品方' }, { field: 'completeNot', @@ -105,40 +114,58 @@ }, { field: 'connectSite', - title: '连接地址', + title: '网盘地址', formatter: function(value) { if (value != null && value !== ''){return '详情图片';} else {return '无'} } }, { - field: 'releaseDate', - title: '上映年份' + field: 'upTime', + title: '上架时间' }, { - field: 'region', - title: '地区' + field: 'specialItem', + title: '精品剧' }, { field: 'videoType', - title: '视频类型1 科幻 2 爱情 3 恐怖 4 悬疑..' + title: '剧集类型', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(videoTypeDict, value); + } }, { - field: 'score', - title: '评分' + field: 'labelType', + title: '剧集标签', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(labelTypeDict, value); + } + }, + { + field: 'forUser', + title: '对标用户' }, { field: 'numberEpisode', - title: '集数' + title: '前端剧集' }, { field: 'isDelete', - title: '是否删除 1 正常 0 删除' + title: '是否删除 1 正常 0 删除', + visible: false }, { field: 'releaseTime', title: '上映时间' }, + { + field: 'remark', + title: '短剧介绍', + visible: false + }, { title: '操作', align: 'center', diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java index 30c36df..2d36c3c 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java @@ -32,14 +32,18 @@ public class PlayletItem extends BaseEntity{ @TableId(value = "id", type = IdType.AUTO) private Long id; + @Excel(name = "短剧id") + @ApiModelProperty(value = "短剧id") + private String itemId; + /** 来源类型 1.抖音 2.快手 3.视频号 */ @Excel(name = "来源类型 1.抖音 2.快手 3.视频号") @ApiModelProperty(value = "来源类型 1.抖音 2.快手 3.视频号") private Long sourceType; /** 视频名称 */ - @Excel(name = "视频名称") - @ApiModelProperty(value = "视频名称") + @Excel(name = "短剧标题") + @ApiModelProperty(value = "短剧标题") private String videoName; /** 视频是否完结 0 未完结 1 完结 */ @@ -48,34 +52,43 @@ public class PlayletItem extends BaseEntity{ private Long completeNot; /** 视频封面图 */ - @Excel(name = "视频封面图") - @ApiModelProperty(value = "视频封面图") + @Excel(name = "封面图") + @ApiModelProperty(value = "封面图") private String coverPic; + @Excel(name = "主角名称") + @ApiModelProperty(value = "主角名称") + private String actorName; + + @Excel(name = "出品方") + @ApiModelProperty(value = "出品方") + private String producer; + + /** 上映时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出品时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(value = "出品时间") + private Date releaseTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上线时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(value = "上线日期") + private Date upTime; + /** 连接地址 */ - @Excel(name = "连接地址") - @ApiModelProperty(value = "连接地址") + @Excel(name = "视频素材") + @ApiModelProperty(value = "视频素材") private String connectSite; - /** 上映年份 */ - @Excel(name = "上映年份") - @ApiModelProperty(value = "上映年份") - private String releaseDate; - - /** 地区 */ - @Excel(name = "地区") - @ApiModelProperty(value = "地区") - private String region; /** 视频类型1 科幻 2 爱情 3 恐怖 4 悬疑.. */ - @Excel(name = "视频类型1 科幻 2 爱情 3 恐怖 4 悬疑..") - @ApiModelProperty(value = "视频类型1 科幻 2 爱情 3 恐怖 4 悬疑..") + @Excel(name = "类型1 科幻 2 爱情 3 恐怖 4 悬疑..") + @ApiModelProperty(value = "类型1 科幻 2 爱情 3 恐怖 4 悬疑..") private Long videoType; - /** 评分 */ - @Excel(name = "评分") - @ApiModelProperty(value = "评分") - private Long score; + @Excel(name = "标签") + @ApiModelProperty(value = "标签") + private Long labelType; /** 集数 */ @Excel(name = "集数") @@ -87,11 +100,13 @@ public class PlayletItem extends BaseEntity{ @ApiModelProperty(value = "是否删除 1 正常 0 删除") private Long isDelete; - /** 上映时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "上映时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(value = "上映时间") - private Date releaseTime; + @Excel(name = "是否精品剧") + @ApiModelProperty(value = "是否精品剧") + private Long specialItem; + + @Excel(name = "对标用户") + @ApiModelProperty(value = "对标用户") + private String forUser; /** 剧场类型 */ @Excel(name = "剧场类型") diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java index 9a3f3a1..a9d48eb 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java @@ -105,14 +105,8 @@ public class PlayletItemServiceImpl extends ServiceImpl + @@ -16,10 +17,13 @@ - - + + - + + + + @@ -27,7 +31,7 @@ - select id, create_by, create_time, update_by, update_time, remark, source_type, video_name, complete_not, cover_pic, connect_site, release_date, region, video_type, score, number_episode, is_delete, release_time, item_type from playlet_item + select id, item_id, source_type, video_name, complete_not, cover_pic, actor_name, producer, connect_site, release_time, video_type, label_type, item_type, number_episode, up_time, is_delete, special_item, for_user, remark, create_by, update_by, create_time, update_time from playlet_item